From 89b03820018bf7642d8d022504b4ddc7a84225d9 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sun, 18 Sep 2005 00:33:02 -0700 Subject: [PATCH] --- yaml --- r: 9069 b: refs/heads/master c: 628f87f3d585bd0c2b0e39df039585d7a5831cc9 h: refs/heads/master i: 9067: 71d957b708e40fabd0201a6fe3afacf6e0f09ca2 v: v3 --- [refs] | 2 +- trunk/net/ipv4/netfilter/Kconfig | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a75f8d90d210..549081aecb9e 100644 --- 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 index 85190de5710a..e2162d270073 100644 --- 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