---

yaml --- r: 9069 b: refs/heads/master c: 628f87f h: refs/heads/master i: 9067: 71d957b v: v3
git-mirror · Sep 18, 2005 · 89b0382 · 89b0382
1 parent 82adfbf
commit 89b0382
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 987905ded3d19c196dae25cac46c569cac9594b8
+refs/heads/master: 628f87f3d585bd0c2b0e39df039585d7a5831cc9
diff --git a/trunk/net/ipv4/netfilter/Kconfig b/trunk/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