aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2012-06-22 19:43:51 -0400
committerPablo Neira Ayuso <pablo@netfilter.org>2012-06-22 20:13:46 -0400
commit8e36c4b5b673edc6081599b8bd461e062e4910f4 (patch)
tree8400a62a94cf69649348e278bb76eb3f42d55efc /net
parentab5e8b77d53ac8d4c7d9beafc73815da00cf19a5 (diff)
netfilter: ctnetlink: fix compilation with NF_CONNTRACK_EVENTS=n
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>
Diffstat (limited to 'net')
-rw-r--r--net/netfilter/nf_conntrack_netlink.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
index 8bb47339b770..b9b8f4ac7a36 100644
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -478,7 +478,6 @@ nla_put_failure:
478 return -1; 478 return -1;
479} 479}
480 480
481#ifdef CONFIG_NF_CONNTRACK_EVENTS
482static inline size_t 481static inline size_t
483ctnetlink_proto_size(const struct nf_conn *ct) 482ctnetlink_proto_size(const struct nf_conn *ct)
484{ 483{
@@ -565,6 +564,7 @@ ctnetlink_nlmsg_size(const struct nf_conn *ct)
565 ; 564 ;
566} 565}
567 566
567#ifdef CONFIG_NF_CONNTRACK_EVENTS
568static int 568static int
569ctnetlink_conntrack_event(unsigned int events, struct nf_ct_event *item) 569ctnetlink_conntrack_event(unsigned int events, struct nf_ct_event *item)
570{ 570{