net: Fix stacked vlan offload features computation
[ Upstream commit796f2da81b
] 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:58e998c6d2
("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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
b27b36d5d0
commit
72111ffa19
|
@ -2529,11 +2529,14 @@ netdev_features_t netif_skb_dev_features(struct sk_buff *skb,
|
|||
if (skb_shinfo(skb)->gso_segs > dev->gso_max_segs)
|
||||
features &= ~NETIF_F_GSO_MASK;
|
||||
|
||||
if (protocol == htons(ETH_P_8021Q) || protocol == htons(ETH_P_8021AD)) {
|
||||
struct vlan_ethhdr *veh = (struct vlan_ethhdr *)skb->data;
|
||||
protocol = veh->h_vlan_encapsulated_proto;
|
||||
} else if (!vlan_tx_tag_present(skb)) {
|
||||
return harmonize_features(skb, dev, features);
|
||||
if (!vlan_tx_tag_present(skb)) {
|
||||
if (unlikely(protocol == htons(ETH_P_8021Q) ||
|
||||
protocol == htons(ETH_P_8021AD))) {
|
||||
struct vlan_ethhdr *veh = (struct vlan_ethhdr *)skb->data;
|
||||
protocol = veh->h_vlan_encapsulated_proto;
|
||||
} else {
|
||||
return harmonize_features(skb, dev, features);
|
||||
}
|
||||
}
|
||||
|
||||
features &= (dev->vlan_features | NETIF_F_HW_VLAN_CTAG_TX |
|
||||
|
|
Loading…
Reference in New Issue