iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

netfilter: ctnetlink: restore inlining for netlink message size calculation

Browse Source 
Calm down gcc warnings:

net/netfilter/nf_conntrack_netlink.c:529:15: warning: 'ctnetlink_proto_size' defined but not used [-Wunused-function]
 static size_t ctnetlink_proto_size(const struct nf_conn *ct)
               ^
net/netfilter/nf_conntrack_netlink.c:546:15: warning: 'ctnetlink_acct_size' defined but not used [-Wunused-function]
 static size_t ctnetlink_acct_size(const struct nf_conn *ct)
               ^
net/netfilter/nf_conntrack_netlink.c:556:12: warning: 'ctnetlink_secctx_size' defined but not used [-Wunused-function]
 static int ctnetlink_secctx_size(const struct nf_conn *ct)
            ^
net/netfilter/nf_conntrack_netlink.c:572:15: warning: 'ctnetlink_timestamp_size' defined but not used [-Wunused-function]
 static size_t ctnetlink_timestamp_size(const struct nf_conn *ct)
               ^

So gcc compiles them out when CONFIG_NF_CONNTRACK_EVENTS and
CONFIG_NETFILTER_NETLINK_GLUE_CT are not set.

Fixes: 4054ff45454a9a4 ("netfilter: ctnetlink: remove unnecessary inlining")
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Pablo Neira Ayuso 2016-04-15 12:24:57 +02:00
parent adff6c6560
commit 4a96300cec
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/netfilter/nf_conntrack_netlink.c
View File

@ -336,7 +336,7 @@ nla_put_failure:
#endif #endif
#ifdef CONFIG_NF_CONNTRACK_LABELS #ifdef CONFIG_NF_CONNTRACK_LABELS
static int ctnetlink_label_size(const struct nf_conn *ct) static inline int ctnetlink_label_size(const struct nf_conn *ct)
{ {
struct nf_conn_labels *labels = nf_ct_labels_find(ct); struct nf_conn_labels *labels = nf_ct_labels_find(ct);
@ -526,7 +526,7 @@ nla_put_failure:
return -1; return -1;
} }
static size_t ctnetlink_proto_size(const struct nf_conn *ct) static inline size_t ctnetlink_proto_size(const struct nf_conn *ct)
{ {
struct nf_conntrack_l3proto *l3proto; struct nf_conntrack_l3proto *l3proto;
struct nf_conntrack_l4proto *l4proto; struct nf_conntrack_l4proto *l4proto;
@ -543,7 +543,7 @@ static size_t ctnetlink_proto_size(const struct nf_conn *ct)
return len; return len;
} }
static size_t ctnetlink_acct_size(const struct nf_conn *ct) static inline size_t ctnetlink_acct_size(const struct nf_conn *ct)
{ {
if (!nf_ct_ext_exist(ct, NF_CT_EXT_ACCT)) if (!nf_ct_ext_exist(ct, NF_CT_EXT_ACCT))
return 0; return 0;
@ -553,7 +553,7 @@ static size_t ctnetlink_acct_size(const struct nf_conn *ct)
; ;
} }
static int ctnetlink_secctx_size(const struct nf_conn *ct) static inline int ctnetlink_secctx_size(const struct nf_conn *ct)
{ {
#ifdef CONFIG_NF_CONNTRACK_SECMARK #ifdef CONFIG_NF_CONNTRACK_SECMARK
int len, ret; int len, ret;
@ -569,7 +569,7 @@ static int ctnetlink_secctx_size(const struct nf_conn *ct)
#endif #endif
} }
static size_t ctnetlink_timestamp_size(const struct nf_conn *ct) static inline size_t ctnetlink_timestamp_size(const struct nf_conn *ct)
{ {
#ifdef CONFIG_NF_CONNTRACK_TIMESTAMP #ifdef CONFIG_NF_CONNTRACK_TIMESTAMP
if (!nf_ct_ext_exist(ct, NF_CT_EXT_TSTAMP)) if (!nf_ct_ext_exist(ct, NF_CT_EXT_TSTAMP))