diff options
| author | KOVACS Krisztian <hidden@balabit.hu> | 2010-12-15 23:53:41 +0100 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2010-12-15 23:53:41 +0100 |
| commit | ae90bdeaeac6b964b7a1e853a90a19f358a9ac20 (patch) | |
| tree | 9607a9fd194d3745a184d37d1b1bf1b9a703dd68 /net/core/skbuff.c | |
| parent | f1c722295e029eace7960fc687efd5afd67dc555 (diff) | |
| download | lwn-ae90bdeaeac6b964b7a1e853a90a19f358a9ac20.tar.gz lwn-ae90bdeaeac6b964b7a1e853a90a19f358a9ac20.zip | |
netfilter: fix compilation when conntrack is disabled but tproxy is enabled
The IPv6 tproxy patches split IPv6 defragmentation off of conntrack, but
failed to update the #ifdef stanzas guarding the defragmentation related
fields and code in skbuff and conntrack related code in nf_defrag_ipv6.c.
This patch adds the required #ifdefs so that IPv6 tproxy can truly be used
without connection tracking.
Original report:
http://marc.info/?l=linux-netdev&m=129010118516341&w=2
Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: KOVACS Krisztian <hidden@balabit.hu>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/core/skbuff.c')
| -rw-r--r-- | net/core/skbuff.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 104f8444754a..74ebf4b5258a 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -380,6 +380,8 @@ static void skb_release_head_state(struct sk_buff *skb) } #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) nf_conntrack_put(skb->nfct); +#endif +#ifdef NET_SKBUFF_NF_DEFRAG_NEEDED nf_conntrack_put_reasm(skb->nfct_reasm); #endif #ifdef CONFIG_BRIDGE_NETFILTER |