These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / net / Kconfig

diff --git a/kernel/net/Kconfig b/kernel/net/Kconfig
index 44dd578..127da94 100644 (file)
--- a/kernel/net/Kconfig
+++ b/kernel/net/Kconfig
@@ -45,6 +45,9 @@ config COMPAT_NETLINK_MESSAGES
          Newly written code should NEVER need this option but do
          compat-independent messages instead!
 
+config NET_INGRESS
+       bool
+
 menu "Networking options"
 
 source "net/packet/Kconfig"
@@ -229,6 +232,7 @@ source "net/netlink/Kconfig"
 source "net/mpls/Kconfig"
 source "net/hsr/Kconfig"
 source "net/switchdev/Kconfig"
+source "net/l3mdev/Kconfig"
 
 config RPS
        bool
@@ -371,6 +375,13 @@ source "net/caif/Kconfig"
 source "net/ceph/Kconfig"
 source "net/nfc/Kconfig"
 
+config LWTUNNEL
+       bool "Network light weight tunnels"
+       ---help---
+         This feature provides an infrastructure to support light weight
+         tunnels like mpls. There is no netdevice associated with a light
+         weight tunnel endpoint. Tunnel encapsulation parameters are stored
+         with light weight tunnel state associated with fib routes.
 
 endif   # if NET