[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>

diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig
index 85190de5710ad28c40fc1f3b017d5814373cf9c7..e2162d270073a998849c5368b5d4a5f3826e7be6 100644 (file)
--- 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