diff --git a/[refs] b/[refs] index 9ca2bc2ec33b..8cb3fb1da0be 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b805007545813d276c844f0f6d6c825b07c6aec6 +refs/heads/master: 9b05126baa146fc3f41360164141d4e1b3ea93c4 diff --git a/trunk/net/Kconfig b/trunk/net/Kconfig index ce77db4fcec8..c19f549c8e74 100644 --- a/trunk/net/Kconfig +++ b/trunk/net/Kconfig @@ -119,12 +119,6 @@ menuconfig NETFILTER under "iptables" for the location of these packages. - Make sure to say N to "Fast switching" below if you intend to say Y - here, as Fast switching currently bypasses netfilter. - - Chances are that you should say Y here if you compile a kernel which - will run as a router and N for regular hosts. If unsure, say N. - if NETFILTER config NETFILTER_DEBUG