From c19678ed417861253dce43c84cd58f144a84832c Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Wed, 23 Nov 2011 16:07:00 -0500 Subject: [PATCH] --- yaml --- r: 276219 b: refs/heads/master c: 46a246c4dff9f248913e791b69f2336cd8d4ec41 h: refs/heads/master i: 276217: bd63625b79a6e813095c9561ca0eebe220a0e544 276215: 5fbdaa718652b8c8dd8c62429d72dea2174909db v: v3 --- [refs] | 2 +- trunk/net/ipv4/netfilter/Kconfig | 1 - trunk/net/ipv6/netfilter/Kconfig | 1 - trunk/net/netfilter/Kconfig | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1001cb4a3354..b8637b664c5a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c16a98ed91597b40b22b540c6517103497ef8e74 +refs/heads/master: 46a246c4dff9f248913e791b69f2336cd8d4ec41 diff --git a/trunk/net/ipv4/netfilter/Kconfig b/trunk/net/ipv4/netfilter/Kconfig index 1dfc18a03fd4..f19f2182894c 100644 --- a/trunk/net/ipv4/netfilter/Kconfig +++ b/trunk/net/ipv4/netfilter/Kconfig @@ -325,7 +325,6 @@ config IP_NF_TARGET_TTL # raw + specific targets config IP_NF_RAW tristate 'raw table support (required for NOTRACK/TRACE)' - depends on NETFILTER_ADVANCED help This option adds a `raw' table to iptables. This table is the very first in the netfilter framework and hooks in at the PREROUTING diff --git a/trunk/net/ipv6/netfilter/Kconfig b/trunk/net/ipv6/netfilter/Kconfig index 448464844a25..f792b34cbe9c 100644 --- a/trunk/net/ipv6/netfilter/Kconfig +++ b/trunk/net/ipv6/netfilter/Kconfig @@ -186,7 +186,6 @@ config IP6_NF_MANGLE config IP6_NF_RAW tristate 'raw table support (required for TRACE)' - depends on NETFILTER_ADVANCED help This option adds a `raw' table to ip6tables. This table is the very first in the netfilter framework and hooks in at the PREROUTING diff --git a/trunk/net/netfilter/Kconfig b/trunk/net/netfilter/Kconfig index 8260b13d93c9..e8f379692294 100644 --- a/trunk/net/netfilter/Kconfig +++ b/trunk/net/netfilter/Kconfig @@ -542,7 +542,6 @@ config NETFILTER_XT_TARGET_NOTRACK tristate '"NOTRACK" target support' depends on IP_NF_RAW || IP6_NF_RAW depends on NF_CONNTRACK - depends on NETFILTER_ADVANCED help The NOTRACK target allows a select rule to specify which packets *not* to enter the conntrack/NAT