diff options
| author | David S. Miller <davem@davemloft.net> | 2023-04-23 14:16:45 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2023-04-23 14:16:45 +0100 |
| commit | 00266b365d2b5a7ab4c9fa300784607d5770f8bc (patch) | |
| tree | 5cbeb17571c9738e1bcd2f33c02989b8e4e9eb42 /drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | |
| parent | 4d2bd2581c3bc73e9fdf5f82b25c359212567457 (diff) | |
| parent | 0bcf2e4aca6c29a07555b713f2fb461dc38d5977 (diff) | |
Merge branch 'dsa-skb_mac_header'
Vladimir Oltean says:
====================
Remove skb_mac_header() dependency in DSA xmit path
Eric started working on removing skb_mac_header() assumptions from the
networking xmit path, and I offered to help for DSA:
https://lore.kernel.org/netdev/20230321164519.1286357-1-edumazet@google.com/
The majority of this patch set is a straightforward replacement of
skb_mac_header() with skb->data (hidden either behind skb_eth_hdr(), or
behind skb_vlan_eth_hdr()). The only patch which is more "interesting"
is 9/9.
Another potential caller of __skb_vlan_pop() on xmit (and therefore
also of skb_mac_header()) is tcf_vlan_act(), but I haven't had the time
to investigate that (enough to submit changes other than what's here).
v1->v2:
- 09/09: document the vlan_tci argument of vlan_remove_tag() in the kdoc
v1 at:
https://lore.kernel.org/netdev/20230322233823.1806736-1-vladimir.oltean@nxp.com/
Cc: Madalin Bucur <madalin.bucur@nxp.com>
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/freescale/dpaa/dpaa_eth.c')
| -rw-r--r-- | drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c index 9318a2554056..1fa676308c5e 100644 --- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c +++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c @@ -1482,13 +1482,8 @@ static int dpaa_enable_tx_csum(struct dpaa_priv *priv, parse_result = (struct fman_prs_result *)parse_results; /* If we're dealing with VLAN, get the real Ethernet type */ - if (ethertype == ETH_P_8021Q) { - /* We can't always assume the MAC header is set correctly - * by the stack, so reset to beginning of skb->data - */ - skb_reset_mac_header(skb); - ethertype = ntohs(vlan_eth_hdr(skb)->h_vlan_encapsulated_proto); - } + if (ethertype == ETH_P_8021Q) + ethertype = ntohs(skb_vlan_eth_hdr(skb)->h_vlan_encapsulated_proto); /* Fill in the relevant L3 parse result fields * and read the L4 protocol type |