diff options
| author | Vladimir Oltean <vladimir.oltean@nxp.com> | 2023-04-21 01:55:56 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2023-04-23 14:16:44 +0100 |
| commit | eabb1494c9f20362ae53a9991481a1523be4f4b7 (patch) | |
| tree | 309bbb2bc02550d0d94b8301d798ddc802c4250d /net/dsa | |
| parent | e2fdfd7119128b49d81972a75e74169802aa8ae0 (diff) | |
| download | linux-eabb1494c9f20362ae53a9991481a1523be4f4b7.tar.gz linux-eabb1494c9f20362ae53a9991481a1523be4f4b7.tar.bz2 linux-eabb1494c9f20362ae53a9991481a1523be4f4b7.zip | |
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 6d1ccff62780 ("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>
Diffstat (limited to 'net/dsa')
| -rw-r--r-- | net/dsa/tag_ocelot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dsa/tag_ocelot.c b/net/dsa/tag_ocelot.c index 28ebecafdd24..73ee09de1a3a 100644 --- a/net/dsa/tag_ocelot.c +++ b/net/dsa/tag_ocelot.c @@ -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) { |