shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 02:50:49 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
[ Upstream commit eabb1494c9 ]

skb_mac_header() will no longer be available in the TX path when
reverting commit 6d1ccff627 ("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: 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>
Stable-dep-of: 67c3ca2c5cfe ("net: mscc: ocelot: use ocelot_xmit_get_vlan_info() also for FDMA and register injection")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Vladimir Oltean
2023-04-21 01:55:56 +03:00
committed by Greg Kroah-Hartman
parent a23c49a5ea
commit 4aae448651
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/dsa/tag_ocelot.c
View File

@@ -22,7 +22,7 @@ static void ocelot_xmit_get_vlan_info(struct sk_buff *skb, struct dsa_port *dp,
return; return;
} }
hdr = (struct vlan_ethhdr *)skb_mac_header(skb); hdr = skb_vlan_eth_hdr(skb);
br_vlan_get_proto(br, &proto); br_vlan_get_proto(br, &proto);
if (ntohs(hdr->h_vlan_proto) == proto) { if (ntohs(hdr->h_vlan_proto) == proto) {