diff options
| author | Vladimir Oltean <vladimir.oltean@nxp.com> | 2023-04-21 00:55:53 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2023-04-23 15:16:44 +0200 |
| commit | f90615ada0b1e21a9d93ff89b04549fd7a92c92b (patch) | |
| tree | 3e28e2a926ed784c16043f4a8667a5ac4a731e37 | |
| parent | drivers/net/phy: add driver for Microchip LAN867x 10BASE-T1S PHY (diff) | |
| download | linux-f90615ada0b1e21a9d93ff89b04549fd7a92c92b.tar.xz linux-f90615ada0b1e21a9d93ff89b04549fd7a92c92b.zip | |
net: vlan: don't adjust MAC header in __vlan_insert_inner_tag() unless set
This is a preparatory change for the deletion of skb_reset_mac_header(skb)
from __dev_queue_xmit(). After that deletion, skb_mac_header(skb) will
no longer be set in TX paths, from which __vlan_insert_inner_tag() can
still be called (perhaps indirectly).
If we don't make this change, then an unset MAC header (equal to ~0U)
will become set after the adjustment with VLAN_HLEN.
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/linux/if_vlan.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h index 6864b89ef868..90b76d63c11c 100644 --- a/include/linux/if_vlan.h +++ b/include/linux/if_vlan.h @@ -351,7 +351,8 @@ static inline int __vlan_insert_inner_tag(struct sk_buff *skb, /* Move the mac header sans proto to the beginning of the new header. */ if (likely(mac_len > ETH_TLEN)) memmove(skb->data, skb->data + VLAN_HLEN, mac_len - ETH_TLEN); - skb->mac_header -= VLAN_HLEN; + if (skb_mac_header_was_set(skb)) + skb->mac_header -= VLAN_HLEN; veth = (struct vlan_ethhdr *)(skb->data + mac_len - ETH_HLEN); |