]> git.baikalelectronics.ru Git - kernel.git/commit
netfilter: fix module dependency issues with IPv6 defragmentation, ip6tables and...
authorKOVACS Krisztian <hidden@balabit.hu>
Sun, 24 Oct 2010 23:38:32 +0000 (23:38 +0000)
committerDavid S. Miller <davem@davemloft.net>
Mon, 25 Oct 2010 20:58:36 +0000 (13:58 -0700)
commite31804a9394058176143650ae12afb21c78a4e3c
tree995a09d340c55a01a4d1b6235c3a8efea6b8a14f
parent54e53ad2c2168edd2c6067e56f1b59a7ca37c34e
netfilter: fix module dependency issues with IPv6 defragmentation, ip6tables and xt_TPROXY

One of the previous tproxy related patches split IPv6 defragmentation and
connection tracking, but did not correctly add Kconfig stanzas to handle the
new dependencies correctly. This patch fixes that by making the config options
mirror the setup we have for IPv4: a distinct config option for defragmentation
that is automatically selected by both connection tracking and
xt_TPROXY/xt_socket.

The patch also changes the #ifdefs enclosing IPv6 specific code in xt_socket
and xt_TPROXY: we only compile these in case we have ip6tables support enabled.

Signed-off-by: KOVACS Krisztian <hidden@balabit.hu>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/netfilter/Kconfig
net/ipv6/netfilter/Makefile
net/netfilter/Kconfig
net/netfilter/xt_TPROXY.c
net/netfilter/xt_socket.c