]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
tun: remove bogus hardware vlan acceleration flags from vlan_features
authorFernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
Tue, 18 Feb 2014 12:20:09 +0000 (21:20 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 24 Mar 2014 04:43:59 +0000 (21:43 -0700)
commit4d9c46adfdaee7290439d4474f28d771d9bcdf16
tree8c02264caa2019930f87b6bd14eda7a414a180f4
parent9ed7806263aea63f3003937a406fa06780052694
tun: remove bogus hardware vlan acceleration flags from vlan_features

[ Upstream commit 6671b2240c54585d4afb5286a29f1569fe5e40a8 ]

Even though only the outer vlan tag can be HW accelerated in the transmission
path, in the TUN/TAP driver vlan_features mirrors hw_features, which happens
to have the NETIF_F_HW_VLAN_?TAG_TX flags set. Because of this, during packet
tranmisssion through a stacked vlan device dev_hard_start_xmit, (incorrectly)
assuming that the vlan device supports hardware vlan acceleration, does not
add the vlan header to the skb payload and the inner vlan tags are lost
(vlan_tci contains the outer vlan tag when userspace reads the packet from
the tap device).

Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
Signed-off-by: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/tun.c