diff options
| author | David S. Miller <davem@davemloft.net> | 2011-11-23 16:07:00 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-11-23 16:07:00 -0500 |
| commit | 46a246c4dff9f248913e791b69f2336cd8d4ec41 (patch) | |
| tree | 2f8d10fc0d3afdc82a1fa3295a456507c99d549b | |
| parent | c16a98ed91597b40b22b540c6517103497ef8e74 (diff) | |
| download | linux-46a246c4dff9f248913e791b69f2336cd8d4ec41.tar.gz linux-46a246c4dff9f248913e791b69f2336cd8d4ec41.tar.bz2 linux-46a246c4dff9f248913e791b69f2336cd8d4ec41.zip | |
netfilter: Remove NOTRACK/RAW dependency on NETFILTER_ADVANCED.
Distributions are using this in their default scripts, so don't hide
them behind the advanced setting.
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ipv4/netfilter/Kconfig | 1 | ||||
| -rw-r--r-- | net/ipv6/netfilter/Kconfig | 1 | ||||
| -rw-r--r-- | net/netfilter/Kconfig | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig index 1dfc18a03fd4..f19f2182894c 100644 --- a/net/ipv4/netfilter/Kconfig +++ b/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/net/ipv6/netfilter/Kconfig b/net/ipv6/netfilter/Kconfig index 448464844a25..f792b34cbe9c 100644 --- a/net/ipv6/netfilter/Kconfig +++ b/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/net/netfilter/Kconfig b/net/netfilter/Kconfig index 8260b13d93c9..e8f379692294 100644 --- a/net/netfilter/Kconfig +++ b/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 |