Merge tag 'omap-for-v4.10/fixes-rc1' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/net/Kconfig b/net/Kconfig
index c2cdbce629bdde162a651fc346d898c7e188f34c..a1005007224ca04ee673fb948776107d6ba075c4 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -369,6 +369,7 @@ source "net/irda/Kconfig"
 source "net/bluetooth/Kconfig"
 source "net/rxrpc/Kconfig"
 source "net/kcm/Kconfig"
+source "net/strparser/Kconfig"
 
 config FIB_RULES
        bool
@@ -401,6 +402,14 @@ config LWTUNNEL
          weight tunnel endpoint. Tunnel encapsulation parameters are stored
          with light weight tunnel state associated with fib routes.
 
+config LWTUNNEL_BPF
+       bool "Execute BPF program as route nexthop action"
+       depends on LWTUNNEL
+       default y if LWTUNNEL=y
+       ---help---
+         Allows to run BPF programs as a nexthop action following a route
+         lookup for incoming and outgoing packets.
+
 config DST_CACHE
        bool
        default n