aboutsummaryrefslogtreecommitdiffstats
path: root/net/netfilter/Kconfig
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2016-10-27 19:49:48 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2016-11-01 20:50:31 +0100
commit8db4c5be88f62ffd7a552f70687a10c614dc697b (patch)
treee4804a3bbcf2271d7ee5ca85f2b49e9e68abc9e1 /net/netfilter/Kconfig
parent1fddf4bad0ac9f4d32c74af286fc1eec2a03c82c (diff)
downloadlinux-8db4c5be88f62ffd7a552f70687a10c614dc697b.tar.gz
netfilter: move socket lookup infrastructure to nf_socket_ipv{4,6}.c
We need this split to reuse existing codebase for the upcoming nf_tables socket expression. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter/Kconfig')
-rw-r--r--net/netfilter/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index 854dadb196a1d5..ed00ec114ea25b 100644
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -1426,9 +1426,10 @@ config NETFILTER_XT_MATCH_SOCKET
tristate '"socket" match support'
depends on NETFILTER_XTABLES
depends on NETFILTER_ADVANCED
- depends on !NF_CONNTRACK || NF_CONNTRACK
depends on IPV6 || IPV6=n
depends on IP6_NF_IPTABLES || IP6_NF_IPTABLES=n
+ depends on NF_SOCKET_IPV4
+ depends on NF_SOCKET_IPV6
select NF_DEFRAG_IPV4
select NF_DEFRAG_IPV6 if IP6_NF_IPTABLES != n
help