Commit f90615ad authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller
Browse files

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: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4d2bd258

include/linux/if_vlan.h

+2 −1
Original line number Diff line number Diff line
@@ -351,6 +351,7 @@ 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);

	if (skb_mac_header_was_set(skb))

		skb->mac_header -= VLAN_HLEN;



	veth = (struct vlan_ethhdr *)(skb->data + mac_len - ETH_HLEN);