git.stricted.de - GitHub/LineageOS/android_kernel_motorola

author	KOVACS Krisztian <hidden@balabit.hu>
	Wed, 12 Jan 2011 19:25:08 +0000 (20:25 +0100)
committer	Pablo Neira Ayuso <pablo@netfilter.org>
	Wed, 12 Jan 2011 19:25:08 +0000 (20:25 +0100)
commit	2fc72c7b84002ffb3c66918e2a7b0ee607d8b5aa
tree	df97dadb97bf3c9b46b7c557d8ac14b9ab1c17b3	tree \| snapshot (tar.gz zip)
parent	2f46e07995734a363608e974a82fd05d5b610750	commit \| diff

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>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: KOVACS Krisztian <hidden@balabit.hu>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

include/linux/skbuff.h		diff \| blob \| blame \| history
include/net/netfilter/ipv6/nf_conntrack_ipv6.h		diff \| blob \| blame \| history
include/net/netfilter/ipv6/nf_defrag_ipv6.h		diff \| blob \| blame \| history
net/core/skbuff.c		diff \| blob \| blame \| history
net/ipv6/netfilter/nf_defrag_ipv6_hooks.c		diff \| blob \| blame \| history