]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
net: Fix stacked vlan offload features computation
authorToshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
Mon, 22 Dec 2014 10:04:14 +0000 (19:04 +0900)
committerJiri Slaby <jslaby@suse.cz>
Mon, 26 Jan 2015 13:39:16 +0000 (14:39 +0100)
commit6e1a8eb4ed3f954059ffae5563710275bc63d4fa
tree8a8f07fd47acd7c6f44403393427d5a2f20b0275
parente6f7e1dc44d6cbc3ca844b8d1f6c0bab6672f77a
net: Fix stacked vlan offload features computation

[ Upstream commit 796f2da81bead71ffc91ef70912cd8d1827bf756 ]

When vlan tags are stacked, it is very likely that the outer tag is stored
in skb->vlan_tci and skb->protocol shows the inner tag's vlan_proto.
Currently netif_skb_features() first looks at skb->protocol even if there
is the outer tag in vlan_tci, thus it incorrectly retrieves the protocol
encapsulated by the inner vlan instead of the inner vlan protocol.
This allows GSO packets to be passed to HW and they end up being
corrupted.

Fixes: 58e998c6d239 ("offloading: Force software GSO for multiple vlan tags.")
Signed-off-by: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
net/core/dev.c