netfilter: fix compilation when conntrack is disabled but tproxy is enabled
authorKOVACS Krisztian <hidden@balabit.hu>
Wed, 15 Dec 2010 22:53:41 +0000 (23:53 +0100)
committerPatrick McHardy <kaber@trash.net>
Wed, 15 Dec 2010 22:53:41 +0000 (23:53 +0100)
commitae90bdeaeac6b964b7a1e853a90a19f358a9ac20
tree9607a9fd194d3745a184d37d1b1bf1b9a703dd68
parentf1c722295e029eace7960fc687efd5afd67dc555
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>
include/linux/skbuff.h
include/net/netfilter/ipv6/nf_conntrack_ipv6.h
include/net/netfilter/ipv6/nf_defrag_ipv6.h
net/core/skbuff.c
net/ipv6/netfilter/nf_defrag_ipv6_hooks.c