net: Define eth_stp_addr in linux/etherdevice.h

[mirror_ubuntu-bionic-kernel.git] / net / Kconfig

diff --git a/net/Kconfig b/net/Kconfig
index 7d57ef34b79cb09af2675217a0fad574c602798b..9dba2715919d7668af369a34ed2d67089b112cd4 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -166,13 +166,6 @@ menuconfig NETFILTER
 
 if NETFILTER
 
-config NETFILTER_DEBUG
-       bool "Network packet filtering debugging"
-       depends on NETFILTER
-       help
-         You can say Y here if you want to get additional messages useful in
-         debugging the netfilter code.
-
 config NETFILTER_ADVANCED
        bool "Advanced netfilter configuration"
        depends on NETFILTER
@@ -235,6 +228,7 @@ source "net/openvswitch/Kconfig"
 source "net/vmw_vsock/Kconfig"
 source "net/netlink/Kconfig"
 source "net/mpls/Kconfig"
+source "net/nsh/Kconfig"
 source "net/hsr/Kconfig"
 source "net/switchdev/Kconfig"
 source "net/l3mdev/Kconfig"
@@ -301,6 +295,18 @@ config BPF_JIT
          /proc/sys/net/core/bpf_jit_harden   (optional)
          /proc/sys/net/core/bpf_jit_kallsyms (optional)
 
+config BPF_STREAM_PARSER
+       bool "enable BPF STREAM_PARSER"
+       depends on BPF_SYSCALL
+       select STREAM_PARSER
+       ---help---
+        Enabling this allows a stream parser to be used with
+        BPF_MAP_TYPE_SOCKMAP.
+
+        BPF_MAP_TYPE_SOCKMAP provides a map type to use with network sockets.
+        It can be used to enforce socket policy, implement socket redirects,
+        etc.
+
 config NET_FLOW_LIMIT
        bool
        depends on RPS
@@ -364,7 +370,6 @@ endmenu
 
 source "net/ax25/Kconfig"
 source "net/can/Kconfig"
-source "net/irda/Kconfig"
 source "net/bluetooth/Kconfig"
 source "net/rxrpc/Kconfig"
 source "net/kcm/Kconfig"