Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

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

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 95c32f2d7601b9180d43b77e1c143d4988f56962..100fbdc9b95c8475a2ab42928254996b1b2beef6 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -135,6 +135,7 @@ config MACVTAP
        tristate "MAC-VLAN based tap driver"
        depends on MACVLAN
        depends on INET
+       select TAP
        help
          This adds a specialized tap character device driver that is based
          on the MAC-VLAN network interface, called macvtap. A macvtap device
@@ -165,11 +166,25 @@ config IPVLAN
       To compile this driver as a module, choose M here: the module
       will be called ipvlan.
 
+config IPVTAP
+       tristate "IP-VLAN based tap driver"
+       depends on IPVLAN
+       depends on INET
+       select TAP
+       ---help---
+         This adds a specialized tap character device driver that is based
+         on the IP-VLAN network interface, called ipvtap. An ipvtap device
+         can be added in the same way as a ipvlan device, using 'type
+         ipvtap', and then be accessed through the tap user space interface.
+
+         To compile this driver as a module, choose M here: the module
+         will be called ipvtap.
 
 config VXLAN
        tristate "Virtual eXtensible Local Area Network (VXLAN)"
        depends on INET
        select NET_UDP_TUNNEL
+       select GRO_CELLS
        ---help---
          This allows one to create vxlan virtual interfaces that provide
          Layer 2 Networks over Layer 3 Networks. VXLAN is often used
@@ -184,6 +199,7 @@ config GENEVE
        tristate "Generic Network Virtualization Encapsulation"
        depends on INET && NET_UDP_TUNNEL
        select NET_IP_TUNNEL
+       select GRO_CELLS
        ---help---
          This allows one to create geneve virtual interfaces that provide
          Layer 2 Networks over Layer 3 Networks. GENEVE is often used
@@ -216,6 +232,7 @@ config MACSEC
        select CRYPTO
        select CRYPTO_AES
        select CRYPTO_GCM
+       select GRO_CELLS
        ---help---
           MACsec is an encryption standard for Ethernet.
 
@@ -284,6 +301,12 @@ config TUN
 
          If you don't know what to use this for, you don't need it.
 
+config TAP
+       tristate
+       ---help---
+         This option is selected by any driver implementing tap user space
+         interface for a virtual interface to re-use core tap functionality.
+
 config TUN_VNET_CROSS_LE
        bool "Support for cross-endian vnet headers on little-endian kernels"
        default n
@@ -437,6 +460,9 @@ config XEN_NETDEV_BACKEND
 config VMXNET3
        tristate "VMware VMXNET3 ethernet driver"
        depends on PCI && INET
+       depends on !(PAGE_SIZE_64KB || ARM64_64K_PAGES || \
+                    IA64_PAGE_SIZE_64KB || MICROBLAZE_64K_PAGES || \
+                    PARISC_PAGE_SIZE_64KB || PPC_64K_PAGES)
        help
          This driver supports VMware's vmxnet3 virtual ethernet NIC.
          To compile this driver as a module, choose M here: the