aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@netfilter.org>2005-09-18 03:33:02 -0400
committerDavid S. Miller <davem@davemloft.net>2005-09-18 03:33:02 -0400
commit628f87f3d585bd0c2b0e39df039585d7a5831cc9 (patch)
treeaedd58a76eeb0f80a90a4ac8a7b2c71534f2f0b4
parent987905ded3d19c196dae25cac46c569cac9594b8 (diff)
[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 85190de5710a..e2162d270073 100644
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
@@ -8,7 +8,6 @@ menu "IP: Netfilter Configuration"
8# connection tracking, helpers and protocols 8# connection tracking, helpers and protocols
9config IP_NF_CONNTRACK 9config IP_NF_CONNTRACK
10 tristate "Connection tracking (required for masq/NAT)" 10 tristate "Connection tracking (required for masq/NAT)"
11 select NETFILTER_NETLINK if IP_NF_CONNTRACK_NETLINK!=n
12 ---help--- 11 ---help---
13 Connection tracking keeps a record of what packets have passed 12 Connection tracking keeps a record of what packets have passed
14 through your machine, in order to figure out how they are related 13 through your machine, in order to figure out how they are related
@@ -55,8 +54,7 @@ config IP_NF_CONNTRACK_EVENTS
55config IP_NF_CONNTRACK_NETLINK 54config IP_NF_CONNTRACK_NETLINK
56 tristate 'Connection tracking netlink interface' 55 tristate 'Connection tracking netlink interface'
57 depends on IP_NF_CONNTRACK && NETFILTER_NETLINK 56 depends on IP_NF_CONNTRACK && NETFILTER_NETLINK
58 default IP_NF_CONNTRACK if NETFILTER_NETLINK=y 57 depends on IP_NF_CONNTRACK!=y || NETFILTER_NETLINK!=m
59 default m if NETFILTER_NETLINK=m
60 help 58 help
61 This option enables support for a netlink-based userspace interface 59 This option enables support for a netlink-based userspace interface
62 60