evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

netfilter: ctnetlink: fix compilation with NF_CONNTRACK_EVENTS=n

Browse source 
This patch fixes compilation with NF_CONNTRACK_EVENTS=n and
NETFILTER_NETLINK_QUEUE_CT=y.

I'm leaving all those static inline functions that calculate the size
of the event message out of the ifdef area of NF_CONNTRACK_EVENTS since
they will not be included by gcc in case they are unused.

Reported-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Pablo Neira Ayuso 2012-06-23 01:43:51 +02:00
parent ab5e8b77d5
commit 8e36c4b5b6
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/netfilter/nf_conntrack_netlink.c
View file

@ -478,7 +478,6 @@ nla_put_failure:
return -1; return -1;
} }
#ifdef CONFIG_NF_CONNTRACK_EVENTS
static inline size_t static inline size_t
ctnetlink_proto_size(const struct nf_conn *ct) ctnetlink_proto_size(const struct nf_conn *ct)
{ {
@ -565,6 +564,7 @@ ctnetlink_nlmsg_size(const struct nf_conn *ct)
; ;
} }
#ifdef CONFIG_NF_CONNTRACK_EVENTS
static int static int
ctnetlink_conntrack_event(unsigned int events, struct nf_ct_event *item) ctnetlink_conntrack_event(unsigned int events, struct nf_ct_event *item)
{ {