bridge: vlan_tunnel: explicitly reset metadata attrs to NULL on failure

[karo-tx-linux.git] / net / Kconfig

diff --git a/net/Kconfig b/net/Kconfig
index a29bb4b41c50e3c55463eaee2a5dda1292b757f6..f19c0c3b9589757856502bc91398e6ee17d8da4c 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -57,6 +57,7 @@ source "net/packet/Kconfig"
 source "net/unix/Kconfig"
 source "net/xfrm/Kconfig"
 source "net/iucv/Kconfig"
+source "net/smc/Kconfig"
 
 config INET
        bool "TCP/IP networking"
@@ -389,6 +390,8 @@ source "net/9p/Kconfig"
 source "net/caif/Kconfig"
 source "net/ceph/Kconfig"
 source "net/nfc/Kconfig"
+source "net/psample/Kconfig"
+source "net/ife/Kconfig"
 
 config LWTUNNEL
        bool "Network light weight tunnels"
@@ -410,6 +413,10 @@ config DST_CACHE
        bool
        default n
 
+config GRO_CELLS
+       bool
+       default n
+
 config NET_DEVLINK
        tristate "Network physical/parent device Netlink interface"
        help