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

[kvmfornfv.git] / kernel / drivers / net / Kconfig

diff --git a/kernel/drivers/net/Kconfig b/kernel/drivers/net/Kconfig
index df51d60..f184fb5 100644 (file)
--- a/kernel/drivers/net/Kconfig
+++ b/kernel/drivers/net/Kconfig
@@ -179,6 +179,20 @@ config VXLAN
          To compile this driver as a module, choose M here: the module
          will be called vxlan.
 
+config GENEVE
+       tristate "Generic Network Virtualization Encapsulation"
+       depends on INET && NET_UDP_TUNNEL
+       select NET_IP_TUNNEL
+       ---help---
+         This allows one to create geneve virtual interfaces that provide
+         Layer 2 Networks over Layer 3 Networks. GENEVE is often used
+         to tunnel virtual network infrastructure in virtualized environments.
+         For more information see:
+           http://tools.ietf.org/html/draft-gross-geneve-02
+
+         To compile this driver as a module, choose M here: the module
+         will be called geneve.
+
 config NETCONSOLE
        tristate "Network console logging support"
        ---help---
@@ -203,8 +217,8 @@ config NET_POLL_CONTROLLER
        def_bool NETPOLL
 
 config NTB_NETDEV
-       tristate "Virtual Ethernet over NTB"
-       depends on NTB
+       tristate "Virtual Ethernet over NTB Transport"
+       depends on NTB_TRANSPORT
 
 config RIONET
        tristate "RapidIO Ethernet over messaging driver support"
@@ -244,6 +258,20 @@ config TUN
 
          If you don't know what to use this for, you don't need it.
 
+config TUN_VNET_CROSS_LE
+       bool "Support for cross-endian vnet headers on little-endian kernels"
+       default n
+       ---help---
+         This option allows TUN/TAP and MACVTAP device drivers in a
+         little-endian kernel to parse vnet headers that come from a
+         big-endian legacy virtio device.
+
+         Userspace programs can control the feature using the TUNSETVNETBE
+         and TUNGETVNETBE ioctls.
+
+         Unless you have a little-endian system hosting a big-endian virtual
+         machine with a legacy virtio NIC, you should say N.
+
 config VETH
        tristate "Virtual ethernet pair device"
        ---help---
@@ -254,7 +282,6 @@ config VETH
 config VIRTIO_NET
        tristate "Virtio network driver"
        depends on VIRTIO
-       select AVERAGE
        ---help---
          This is the virtual network driver for virtio.  It can be used with
          lguest or QEMU based VMMs (like KVM or Xen).  Say Y or M.
@@ -269,6 +296,16 @@ config NLMON
          diagnostics, etc. This is mostly intended for developers or support
          to debug netlink issues. If unsure, say N.
 
+config NET_VRF
+       tristate "Virtual Routing and Forwarding (Lite)"
+       depends on IP_MULTIPLE_TABLES
+       depends on NET_L3_MASTER_DEV
+       depends on IPV6 || IPV6=n
+       depends on IPV6_MULTIPLE_TABLES || IPV6=n
+       ---help---
+         This option enables the support for mapping interfaces into VRF's. The
+         support enables VRF devices.
+
 endif # NET_CORE
 
 config SUNGEM_PHY
@@ -379,6 +416,13 @@ config VMXNET3
          To compile this driver as a module, choose M here: the
          module will be called vmxnet3.
 
+config FUJITSU_ES
+       tristate "FUJITSU Extended Socket Network Device driver"
+       depends on ACPI
+       help
+         This driver provides support for Extended Socket network device
+          on Extended Partitioning of FUJITSU PRIMEQUEST 2000 E2 series.
+
 source "drivers/net/hyperv/Kconfig"
 
 endif # NETDEVICES