Commit 1f5020ac authored Apr 21, 2023 by Vladimir Oltean Committed by David S. Miller Apr 23, 2023

net: vlan: introduce skb_vlan_eth_hdr()



Similar to skb_eth_hdr() introduced in commit 96cc4b69 ("macvlan: do
not assume mac_header is set in macvlan_broadcast()"), let's introduce a
skb_vlan_eth_hdr() helper which can be used in TX-only code paths to get
to the VLAN header based on skb->data rather than based on the
skb_mac_header(skb).

We also consolidate the drivers that dereference skb->data to go through
this helper.

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>

parent f90615ad

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -1935,8 +1935,7 @@ u16 bnx2x_select_queue(struct net_device dev, struct sk_buff skb,

		/* Skip VLAN tag if present */
		if (ether_type == ETH_P_8021Q) {
		struct vlan_ethhdr *vhdr =
		(struct vlan_ethhdr *)skb->data;
		struct vlan_ethhdr *vhdr = skb_vlan_eth_hdr(skb);

		ether_type = ntohs(vhdr->h_vlan_encapsulated_proto);
		}

drivers/net/ethernet/emulex/benet/be_main.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1124,7 +1124,7 @@ static struct sk_buff be_lancer_xmit_workarounds(struct be_adapter adapter,
		struct be_wrb_params
		*wrb_params)
		{
		struct vlan_ethhdr veh = (struct vlan_ethhdr )skb->data;
		struct vlan_ethhdr *veh = skb_vlan_eth_hdr(skb);
		unsigned int eth_hdr_len;
		struct iphdr *ip;

drivers/net/ethernet/hisilicon/hns3/hns3_enet.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1532,7 +1532,7 @@ static int hns3_handle_vtags(struct hns3_enet_ring *tx_ring,
		if (unlikely(rc < 0))
		return rc;

		vhdr = (struct vlan_ethhdr *)skb->data;
		vhdr = skb_vlan_eth_hdr(skb);
		vhdr->h_vlan_TCI \|= cpu_to_be16((skb->priority << VLAN_PRIO_SHIFT)
		& VLAN_PRIO_MASK);

drivers/net/ethernet/intel/i40e/i40e_txrx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -3063,7 +3063,7 @@ static inline int i40e_tx_prepare_vlan_flags(struct sk_buff *skb,
		rc = skb_cow_head(skb, 0);
		if (rc < 0)
		return rc;
		vhdr = (struct vlan_ethhdr *)skb->data;
		vhdr = skb_vlan_eth_hdr(skb);
		vhdr->h_vlan_TCI = htons(tx_flags >>
		I40E_TX_FLAGS_VLAN_SHIFT);
		} else {

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -8798,7 +8798,7 @@ netdev_tx_t ixgbe_xmit_frame_ring(struct sk_buff *skb,

		if (skb_cow_head(skb, 0))
		goto out_drop;
		vhdr = (struct vlan_ethhdr *)skb->data;
		vhdr = skb_vlan_eth_hdr(skb);
		vhdr->h_vlan_TCI = htons(tx_flags >>
		IXGBE_TX_FLAGS_VLAN_SHIFT);
		} else {