diff options
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/netfilter/nf_defrag_ipv4.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/ipv4/netfilter/nf_defrag_ipv4.c b/net/ipv4/netfilter/nf_defrag_ipv4.c index d498a704d456..cb763ae9ed90 100644 --- a/net/ipv4/netfilter/nf_defrag_ipv4.c +++ b/net/ipv4/netfilter/nf_defrag_ipv4.c | |||
@@ -16,9 +16,11 @@ | |||
16 | 16 | ||
17 | #include <linux/netfilter_bridge.h> | 17 | #include <linux/netfilter_bridge.h> |
18 | #include <linux/netfilter_ipv4.h> | 18 | #include <linux/netfilter_ipv4.h> |
19 | #include <net/netfilter/nf_conntrack_zones.h> | ||
20 | #include <net/netfilter/ipv4/nf_defrag_ipv4.h> | 19 | #include <net/netfilter/ipv4/nf_defrag_ipv4.h> |
20 | #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) | ||
21 | #include <net/netfilter/nf_conntrack.h> | 21 | #include <net/netfilter/nf_conntrack.h> |
22 | #endif | ||
23 | #include <net/netfilter/nf_conntrack_zones.h> | ||
22 | 24 | ||
23 | /* Returns new sk_buff, or NULL */ | 25 | /* Returns new sk_buff, or NULL */ |
24 | static int nf_ct_ipv4_gather_frags(struct sk_buff *skb, u_int32_t user) | 26 | static int nf_ct_ipv4_gather_frags(struct sk_buff *skb, u_int32_t user) |
@@ -42,8 +44,10 @@ static enum ip_defrag_users nf_ct_defrag_user(unsigned int hooknum, | |||
42 | { | 44 | { |
43 | u16 zone = NF_CT_DEFAULT_ZONE; | 45 | u16 zone = NF_CT_DEFAULT_ZONE; |
44 | 46 | ||
47 | #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) | ||
45 | if (skb->nfct) | 48 | if (skb->nfct) |
46 | zone = nf_ct_zone((struct nf_conn *)skb->nfct); | 49 | zone = nf_ct_zone((struct nf_conn *)skb->nfct); |
50 | #endif | ||
47 | 51 | ||
48 | #ifdef CONFIG_BRIDGE_NETFILTER | 52 | #ifdef CONFIG_BRIDGE_NETFILTER |
49 | if (skb->nf_bridge && | 53 | if (skb->nf_bridge && |