Commit 796f2da81bead71ffc91ef70912cd8d1827bf756
Committed by
David S. Miller
David S. Miller
1 parent
e51a08b8df
Exists in
ti-lsk-linux-4.1.y
and in
10 other branches
net: Fix stacked vlan offload features computation
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>
Showing 1 changed file with 8 additions and 5 deletions Side-by-side Diff
net/core/dev.c
| ... | ... | @@ -2570,11 +2570,14 @@ |
| 2570 | 2570 | if (gso_segs > dev->gso_max_segs || gso_segs < dev->gso_min_segs) |
| 2571 | 2571 | features &= ~NETIF_F_GSO_MASK; |
| 2572 | 2572 | |
| 2573 | - if (protocol == htons(ETH_P_8021Q) || protocol == htons(ETH_P_8021AD)) { | |
| 2574 | - struct vlan_ethhdr *veh = (struct vlan_ethhdr *)skb->data; | |
| 2575 | - protocol = veh->h_vlan_encapsulated_proto; | |
| 2576 | - } else if (!vlan_tx_tag_present(skb)) { | |
| 2577 | - return harmonize_features(skb, features); | |
| 2573 | + if (!vlan_tx_tag_present(skb)) { | |
| 2574 | + if (unlikely(protocol == htons(ETH_P_8021Q) || | |
| 2575 | + protocol == htons(ETH_P_8021AD))) { | |
| 2576 | + struct vlan_ethhdr *veh = (struct vlan_ethhdr *)skb->data; | |
| 2577 | + protocol = veh->h_vlan_encapsulated_proto; | |
| 2578 | + } else { | |
| 2579 | + return harmonize_features(skb, features); | |
| 2580 | + } | |
| 2578 | 2581 | } |
| 2579 | 2582 | |
| 2580 | 2583 | features = netdev_intersect_features(features, |
