ipv4: call __ip_options_echo() in cookie_v4_check()

[firefly-linux-kernel-4.4.55.git] / net / Kconfig

diff --git a/net/Kconfig b/net/Kconfig
index 4051fdfa43677ccf7142244c97e2e383515e77e8..6272420a721b0f01e15ffc572251a8f0794d5d8f 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -6,6 +6,7 @@ menuconfig NET
        bool "Networking support"
        select NLATTR
        select GENERIC_NET_UTILS
+       select ANON_INODES
        ---help---
          Unless you really know what you are doing, you should say Y here.
          The reason is that some programs need kernel networking support even
@@ -176,10 +177,11 @@ config NETFILTER_ADVANCED
          If unsure, say Y.
 
 config BRIDGE_NETFILTER
-       bool "Bridged IP/ARP packets filtering"
-       depends on BRIDGE && NETFILTER && INET
+       tristate "Bridged IP/ARP packets filtering"
+       depends on BRIDGE
+       depends on NETFILTER && INET
        depends on NETFILTER_ADVANCED
-       default y
+       default m
        ---help---
          Enabling this option will let arptables resp. iptables see bridged
          ARP resp. IP traffic. If you want a bridging firewall, you probably