Commit e4a3659a authored by Marc Kleine-Budde's avatar Marc Kleine-Budde Committed by Jakub Kicinski
Browse files

net: fec: fec_enet_rx_queue(): replace manual VLAN header calculation with skb_vlan_eth_hdr() 



For better readability and maintainability, use the provided helper function
skb_vlan_eth_hdr() to replace manual the VLAN header calculation, and change
the type of vlan_header to struct vlan_ethhdr to take into account that the
Ethernet header plus VLAN header is returned.

Reviewed-by: default avatarFrank Li <Frank.Li@nxp.com>
Reviewed-by: default avatarWei Fang <wei.fang@nxp.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
Link: https://patch.msgid.link/20250618-fec-cleanups-v4-8-c16f9a1af124@pengutronix.de


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent e222c08f

drivers/net/ethernet/freescale/fec_main.c

+1 −2
Original line number Diff line number Diff line
@@ -1859,8 +1859,7 @@ fec_enet_rx_queue(struct net_device *ndev, u16 queue_id, int budget) 
		    fep->bufdesc_ex &&

		    (ebdp->cbd_esc & cpu_to_fec32(BD_ENET_RX_VLAN))) {

			/* Push and remove the vlan tag */

			struct vlan_hdr *vlan_header =

					(struct vlan_hdr *) (data + ETH_HLEN);

			struct vlan_ethhdr *vlan_header = skb_vlan_eth_hdr(skb);

			vlan_tag = ntohs(vlan_header->h_vlan_TCI);



			vlan_packet_rcvd = true;