Merge tag 'ntb-4.2' of git://github.com/jonmason/ntb

[linux-drm-fsl-dcu.git] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 019fceffc9e52980d1f3837b01a299b97782dfca..c18f9e62a9fa2ea181c7ab2c75faaa9bc713b2ec 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -217,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"
@@ -258,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---