Commit 8d0d21f4 authored Feb 18, 2014 by Toshiaki Makita Committed by David S. Miller Feb 20, 2014

veth: Fix vlan_features so as to be able to use stacked vlan interfaces



Even if we create a stacked vlan interface such as veth0.10.20, it sends
single tagged frames (tagged with only vid 10).
Because vlan_features of a veth interface has the
NETIF_F_HW_VLAN_[CTAG/STAG]_TX bits, veth0.10 also has that feature, so
dev_hard_start_xmit(veth0.10) doesn't call __vlan_put_tag() and
vlan_dev_hard_start_xmit(veth0.10) overwrites vlan_tci.
This prevents us from using a combination of 802.1ad and 802.1Q
in containers, etc.

Signed-off-by: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
Acked-by: Flavio Leitner <fbl@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent ebe44f35

drivers/net/veth.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -285,7 +285,8 @@ static void veth_setup(struct net_device *dev)
		dev->ethtool_ops = &veth_ethtool_ops;
		dev->features \|= NETIF_F_LLTX;
		dev->features \|= VETH_FEATURES;
		dev->vlan_features = dev->features;
		dev->vlan_features = dev->features &
		~(NETIF_F_HW_VLAN_CTAG_TX \| NETIF_F_HW_VLAN_STAG_TX);
		dev->destructor = veth_dev_free;

		dev->hw_features = VETH_FEATURES;

Admin message