diff options
author | Ben Hutchings <ben@decadent.org.uk> | 2014-10-31 03:10:31 +0000 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-14 08:47:53 -0800 |
commit | f6ca437d7c4e250e454ed29e0e66d47fdc430d1d (patch) | |
tree | 283df132b84365f92fbbc46db64f666ad19f9322 /drivers/net | |
parent | 9a8955adfba0821f5b354d400303436b6e4b2e13 (diff) | |
download | linux-3.10-f6ca437d7c4e250e454ed29e0e66d47fdc430d1d.tar.gz linux-3.10-f6ca437d7c4e250e454ed29e0e66d47fdc430d1d.tar.bz2 linux-3.10-f6ca437d7c4e250e454ed29e0e66d47fdc430d1d.zip |
drivers/net: macvtap and tun depend on INET
[ Upstream commit de11b0e8c569b96c2cf6a811e3805b7aeef498a3 ]
These drivers now call ipv6_proxy_select_ident(), which is defined
only if CONFIG_INET is enabled. However, they have really depended
on CONFIG_INET for as long as they have allowed sending GSO packets
from userland.
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Fixes: f43798c27684 ("tun: Allow GSO using virtio_net_hdr")
Fixes: b9fb9ee07e67 ("macvtap: add GSO/csum offload support")
Fixes: 5188cd44c55d ("drivers/net, ipv6: Select IPv6 fragment idents for virtio UFO packets")
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 3835321b8cf..3bc3ebc0882 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -139,6 +139,7 @@ config MACVLAN config MACVTAP tristate "MAC-VLAN based tap driver" depends on MACVLAN + depends on INET help This adds a specialized tap character device driver that is based on the MAC-VLAN network interface, called macvtap. A macvtap device @@ -209,6 +210,7 @@ config RIONET_RX_SIZE config TUN tristate "Universal TUN/TAP device driver support" + depends on INET select CRC32 ---help--- TUN/TAP provides packet reception and transmission for user space |