From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934394AbdKGOMp (ORCPT ); Tue, 7 Nov 2017 09:12:45 -0500 Received: from mout.kundenserver.de ([212.227.126.131]:59507 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932671AbdKGOMl (ORCPT ); Tue, 7 Nov 2017 09:12:41 -0500 From: Arnd Bergmann To: Pablo Neira Ayuso , Jozsef Kadlecsik , Florian Westphal , "David S. Miller" Cc: Arnd Bergmann , Liping Zhang , netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] [net-next] netfilter: add ifdef around ctnetlink_proto_size Date: Tue, 7 Nov 2017 15:11:51 +0100 Message-Id: <20171107141214.3312784-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:svYX8Q0P2iN7NJbaTabv7tv3/iay60Ywq3/m87XKbDccCL8FVY1 QWuvUe+yELYq+2toUDNJaasIAFfLXyCLNYvpJSyNA8LvuO+APJJFwOiHXJ3sCKdKAvrfgGI oVycSqM1dJnIcC9N18OnqmN8xcOzUVh7qoHyK8b1LMFyh88MhAgYr0WJG3fXkys0CnMxAJy JbFG7nTz4Y6alyCFQP3Mw== X-UI-Out-Filterresults: notjunk:1;V01:K0:JEXLqNpP/no=:GpIby+mZL4S1Gm76A7o+rA rUZg+Ou4qI5Mgp7B/4w5yCTFk84dGwIwW3mbZlT283KyvjYmGR3BzDICv8oPR/SSaBnzq/D8U W8U0yGvcK26WL+ZIFFttOLPp1M8M6Ddt+cBX/44zaY84oN87a8knlBUaoVRJBa9mVF4nyi5c3 9jyIbFWMYZdkbaSkVVCvau/UMv6b4PksbJltNxMu0gWbuTqP5O9ySIl09vDlo+iQuyWpzJpK6 Z3QXE9rISPziRUrwxvoY0LmZPD3qAY9imbf9ZrEQd92OypUZqcZkx5I0ZXk1Z2S0pVdzUMZ53 sgn1f92ud+XbNAWKA4FCQ/3PUvw1COkDfIXnk5fvh8qyXPHdFsMgPHl0eI8igGpGKb+h9Qvax F9ZIYEOMV5O3NJsHziZHkRVjmSTUKEqe1OaypMf11qcZY8cy3hxkFPL4vws/YRm3K5xJDVVEW ChnfTul6eXqMOfFlGhAlP7aBJChLsQvw6Z5DqsGYccpQQdLiA0mJ5j1rvX4uP7XLx284rnDY0 29kpIhIKIl7ID/BMFu3/mUR/vLBsY9HRGeLT1sUzZnXYbn1BIenYYheChXLHVruN5NSizj6NN kTxSqXj+iKC+1bYd2MfQgobSteoS2fDH4I0S5RKebgHuM3F2qu6kDi2QTJazGd6BgWRjYm5O/ vUQn4+CGNtMpcyrDLQs1tvovtryOfUjCo/X+cuyqU8kay6RVKeVKJ6Tuxzs6P56cmrZqDQg+V tcCEtpLmems1HUI5hlDV5T1r7xMgm+tMc6+Cbw== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This function is no longer marked 'inline', so we now get a warning when it is unused: net/netfilter/nf_conntrack_netlink.c:536:15: error: 'ctnetlink_proto_size' defined but not used [-Werror=unused-function] We could mark it inline again, mark it __maybe_unused, or add an #ifdef around the definition. I'm picking the third approach here since that seems to be what the rest of the file has. Fixes: 5caaed151a68 ("netfilter: conntrack: don't cache nlattr_tuple_size result in nla_size") Signed-off-by: Arnd Bergmann --- net/netfilter/nf_conntrack_netlink.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c index 6e0adfefb9ed..59c08997bfdf 100644 --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c @@ -533,6 +533,7 @@ ctnetlink_fill_info(struct sk_buff *skb, u32 portid, u32 seq, u32 type, return -1; } +#if defined(CONFIG_NETFILTER_NETLINK_GLUE_CT) || defined(CONFIG_NF_CONNTRACK_EVENTS) static size_t ctnetlink_proto_size(const struct nf_conn *ct) { const struct nf_conntrack_l3proto *l3proto; @@ -552,6 +553,7 @@ static size_t ctnetlink_proto_size(const struct nf_conn *ct) return len + len4; } +#endif static inline size_t ctnetlink_acct_size(const struct nf_conn *ct) { -- 2.9.0