Hi Dave, please apply.
[NETFILTER] Solve Kconfig dependency problem
As suggested by Roman Zippel.
Signed-off-by: Harald Welte <redacted>
---
commit 95ef9808bc0702757a40886aed48a6fc03aee47b
tree 03b0cca73e6c7f686702c52291e9eb786bb8f02a
parent 1d21ab174ffeba8e709966dc60e57524553adb84
author Harald Welte [off-list ref] Sa, 17 Sep 2005 17:22:53 +0200
committer Harald Welte [off-list ref] Sa, 17 Sep 2005 17:22:53 +0200
net/ipv4/netfilter/Kconfig | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig
--- 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
--
- Harald Welte <laforge@netfilter.org> http://netfilter.org/
============================================================================
"Fragmentation is like classful addressing -- an interesting early
architectural error that shows how much experimentation was going
on while IP was being designed." -- Paul Vixie