From: Harald Welte Date: Sun, 18 Sep 2005 07:33:02 +0000 (-0700) Subject: [NETFILTER]: Solve Kconfig dependency problem X-Git-Tag: v2.6.14-rc2~5^2~1 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=628f87f3d585bd0c2b0e39df039585d7a5831cc9;p=linux-2.6 [NETFILTER]: Solve Kconfig dependency problem As suggested by Roman Zippel. Signed-off-by: Harald Welte Signed-off-by: David S. Miller --- diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig index 85190de571..e2162d2700 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