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

net: dsa: tag_ocelot: do not rely on skb_mac_header() for VLAN xmit 



skb_mac_header() will no longer be available in the TX path when
reverting commit 6d1ccff6 ("net: reset mac header in
dev_start_xmit()"). As preparation for that, let's use
skb_vlan_eth_hdr() to get to the VLAN header instead, which assumes it's
located at skb->data (assumption which holds true here).

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 e2fdfd71

net/dsa/tag_ocelot.c

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ static void ocelot_xmit_get_vlan_info(struct sk_buff *skb, struct dsa_port *dp, 
		return;

	}



	hdr = (struct vlan_ethhdr *)skb_mac_header(skb);

	hdr = skb_vlan_eth_hdr(skb);

	br_vlan_get_proto(br, &proto);



	if (ntohs(hdr->h_vlan_proto) == proto) {