summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarald Welte <laforge@netfilter.org>2005-09-18 07:33:02 (GMT)
committerDavid S. Miller <davem@davemloft.net>2005-09-18 07:33:02 (GMT)
commit628f87f3d585bd0c2b0e39df039585d7a5831cc9 (patch)
treeaedd58a76eeb0f80a90a4ac8a7b2c71534f2f0b4
parent987905ded3d19c196dae25cac46c569cac9594b8 (diff)
downloadlinux-3.10-628f87f3d585bd0c2b0e39df039585d7a5831cc9.zip
linux-3.10-628f87f3d585bd0c2b0e39df039585d7a5831cc9.tar.gz
linux-3.10-628f87f3d585bd0c2b0e39df039585d7a5831cc9.tar.bz2
[NETFILTER]: Solve Kconfig dependency problem
As suggested by Roman Zippel. Signed-off-by: Harald Welte <laforge@netfilter.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ipv4/netfilter/Kconfig4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig
index 85190de..e2162d2 100644
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
@@ -8,7 +8,6 @@ menu "IP: Netfilter Configuration"
# connection tracking, helpers and protocols
config IP_NF_CONNTRACK
tristate "Connection tracking (required for masq/NAT)"
- select NETFILTER_NETLINK if IP_NF_CONNTRACK_NETLINK!=n
---help---
Connection tracking keeps a record of what packets have passed
through your machine, in order to figure out how they are related
@@ -55,8 +54,7 @@ config IP_NF_CONNTRACK_EVENTS
config IP_NF_CONNTRACK_NETLINK
tristate 'Connection tracking netlink interface'
depends on IP_NF_CONNTRACK && NETFILTER_NETLINK
- default IP_NF_CONNTRACK if NETFILTER_NETLINK=y
- default m if NETFILTER_NETLINK=m
+ depends on IP_NF_CONNTRACK!=y || NETFILTER_NETLINK!=m
help
This option enables support for a netlink-based userspace interface