Commit 8252fcea authored by Arnd Bergmann's avatar Arnd Bergmann Committed by David S. Miller

netfilter: add ifdef around ctnetlink_proto_size

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: 5caaed15 ("netfilter: conntrack: don't cache nlattr_tuple_size result in nla_size")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9421c901
...@@ -533,6 +533,7 @@ ctnetlink_fill_info(struct sk_buff *skb, u32 portid, u32 seq, u32 type, ...@@ -533,6 +533,7 @@ ctnetlink_fill_info(struct sk_buff *skb, u32 portid, u32 seq, u32 type,
return -1; 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) static size_t ctnetlink_proto_size(const struct nf_conn *ct)
{ {
const struct nf_conntrack_l3proto *l3proto; const struct nf_conntrack_l3proto *l3proto;
...@@ -552,6 +553,7 @@ static size_t ctnetlink_proto_size(const struct nf_conn *ct) ...@@ -552,6 +553,7 @@ static size_t ctnetlink_proto_size(const struct nf_conn *ct)
return len + len4; return len + len4;
} }
#endif
static inline size_t ctnetlink_acct_size(const struct nf_conn *ct) static inline size_t ctnetlink_acct_size(const struct nf_conn *ct)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment