From: Florian Westphal <fwestphal@astaro.com>
Date: Mon, 8 Feb 2010 14:39:16 +0000 (+0100)
Subject: netfilter: fix build failure with CONNTRACK=y NAT=n
X-Git-Tag: v2.6.34-rc1~233^2~303^2~29
X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=76780373190d7e8ddfb6fed06aef068e2445c743;p=net-next-2.6.git

netfilter: fix build failure with CONNTRACK=y NAT=n

net/ipv4/netfilter/nf_defrag_ipv4.c: In function 'ipv4_conntrack_defrag':
net/ipv4/netfilter/nf_defrag_ipv4.c:62: error: implicit declaration of function 'nf_ct_is_template'

Signed-off-by: Florian Westphal <fwestphal@astaro.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
---

diff --git a/net/ipv4/netfilter/nf_defrag_ipv4.c b/net/ipv4/netfilter/nf_defrag_ipv4.c
index 77627fa8056..f6f46686cbc 100644
--- a/net/ipv4/netfilter/nf_defrag_ipv4.c
+++ b/net/ipv4/netfilter/nf_defrag_ipv4.c
@@ -17,6 +17,7 @@
 #include <linux/netfilter_bridge.h>
 #include <linux/netfilter_ipv4.h>
 #include <net/netfilter/ipv4/nf_defrag_ipv4.h>
+#include <net/netfilter/nf_conntrack.h>
 
 /* Returns new sk_buff, or NULL */
 static int nf_ct_ipv4_gather_frags(struct sk_buff *skb, u_int32_t user)