From cd1e9e62e88f3c11e5bd642d62db7f9551da4bc5 Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@netfilter.org>
Date: Sat, 17 Sep 2005 00:41:02 -0700
Subject: [PATCH] --- yaml --- r: 9058 b: refs/heads/master c:
 777ed97f3e549832845d70dcae96cb36c41a543a h: refs/heads/master v: v3

---
 [refs]                           |  2 +-
 trunk/net/ipv4/netfilter/Kconfig | 16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index afc349e0d6c2..178fe34d0cbd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22abe310bc4b0c684fd3716af6b6116ff1011707
+refs/heads/master: 777ed97f3e549832845d70dcae96cb36c41a543a
diff --git a/trunk/net/ipv4/netfilter/Kconfig b/trunk/net/ipv4/netfilter/Kconfig
index 30aa8e2ee214..85190de5710a 100644
--- a/trunk/net/ipv4/netfilter/Kconfig
+++ b/trunk/net/ipv4/netfilter/Kconfig
@@ -8,6 +8,7 @@ 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
@@ -51,6 +52,15 @@ config IP_NF_CONNTRACK_EVENTS
 	  
 	  IF unsure, say `N'.
 
+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
+	help
+	  This option enables support for a netlink-based userspace interface
+
+
 config IP_NF_CT_PROTO_SCTP
 	tristate  'SCTP protocol connection tracking support (EXPERIMENTAL)'
 	depends on IP_NF_CONNTRACK && EXPERIMENTAL
@@ -774,11 +784,5 @@ config IP_NF_ARP_MANGLE
 	  Allows altering the ARP packet payload: source and destination
 	  hardware and network addresses.
 
-config IP_NF_CONNTRACK_NETLINK
-        tristate 'Connection tracking netlink interface'
-        depends on IP_NF_CONNTRACK && NETFILTER_NETLINK
-        help
-          This option enables support for a netlink-based userspace interface
-
 endmenu