Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[cascardo/linux.git] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index befd67d..95c32f2 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -149,6 +149,8 @@ config IPVLAN
     tristate "IP-VLAN support"
     depends on INET
     depends on IPV6
+    depends on NETFILTER
+    depends on NET_L3_MASTER_DEV
     ---help---
       This allows one to create virtual devices off of a main interface
       and packets will be delivered based on the dest L3 (IPv6/IPv4 addr)
@@ -192,6 +194,23 @@ config GENEVE
          To compile this driver as a module, choose M here: the module
          will be called geneve.
 
+config GTP
+       tristate "GPRS Tunneling Protocol datapath (GTP-U)"
+       depends on INET && NET_UDP_TUNNEL
+       select NET_IP_TUNNEL
+       ---help---
+         This allows one to create gtp virtual interfaces that provide
+         the GPRS Tunneling Protocol datapath (GTP-U). This tunneling protocol
+         is used to prevent subscribers from accessing mobile carrier core
+         network infrastructure. This driver requires a userspace software that
+         implements the signaling protocol (GTP-C) to update its PDP context
+         base, such as OpenGGSN <http://git.osmocom.org/openggsn/). This
+         tunneling protocol is implemented according to the GSM TS 09.60 and
+         3GPP TS 29.060 standards.
+
+         To compile this drivers as a module, choose M here: the module
+         wil be called gtp.
+
 config MACSEC
        tristate "IEEE 802.1AE MAC-level encryption (MACsec)"
        select CRYPTO