Merge tag 'tty-4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

[linux-2.6-microblaze.git] / net / Kconfig

diff --git a/net/Kconfig b/net/Kconfig
index 9dba271..37ec8e6 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -182,6 +182,7 @@ config BRIDGE_NETFILTER
        depends on BRIDGE
        depends on NETFILTER && INET
        depends on NETFILTER_ADVANCED
+       select NETFILTER_FAMILY_BRIDGE
        default m
        ---help---
          Enabling this option will let arptables resp. iptables see bridged
@@ -336,23 +337,6 @@ config NET_PKTGEN
          To compile this code as a module, choose M here: the
          module will be called pktgen.
 
-config NET_TCPPROBE
-       tristate "TCP connection probing"
-       depends on INET && PROC_FS && KPROBES
-       ---help---
-       This module allows for capturing the changes to TCP connection
-       state in response to incoming packets. It is used for debugging
-       TCP congestion avoidance modules. If you don't understand
-       what was just said, you don't need it: say N.
-
-       Documentation on how to use TCP connection probing can be found
-       at:
-       
-         http://www.linuxfoundation.org/collaborate/workgroups/networking/tcpprobe
-
-       To compile this code as a module, choose M here: the
-       module will be called tcp_probe.
-
 config NET_DROP_MONITOR
        tristate "Network packet drop alerting service"
        depends on INET && TRACEPOINTS