Re: [PATCH net-next 13/13] net: fec: fec_enet_rx_queue(): factor out VLAN handling into separate function fec_enet_rx_vlan()
From: Frank Li
Date: Wed Oct 16 2024 - 23:08:04 EST
On Wed, Oct 16, 2024 at 11:52:01PM +0200, Marc Kleine-Budde wrote:
> In order to clean up of the VLAN handling, factor out the VLAN
> handling into separate function fec_enet_rx_vlan().
>
> Signed-off-by: Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx>
Reviewed-by: Frank Li <Frank.Li@xxxxxxx>
> ---
> drivers/net/ethernet/freescale/fec_main.c | 32 ++++++++++++++++++-------------
> 1 file changed, 19 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
> index d9415c7c16cea3fc3d91e198c21af9fe9e21747e..e14000ba85586b9cd73151e62924c3b4597bb580 100644
> --- a/drivers/net/ethernet/freescale/fec_main.c
> +++ b/drivers/net/ethernet/freescale/fec_main.c
> @@ -1672,6 +1672,22 @@ fec_enet_run_xdp(struct fec_enet_private *fep, struct bpf_prog *prog,
> return ret;
> }
>
> +static void fec_enet_rx_vlan(struct net_device *ndev, struct sk_buff *skb)
> +{
> + struct vlan_ethhdr *vlan_header = skb_vlan_eth_hdr(skb);
> +
> + if (ndev->features & NETIF_F_HW_VLAN_CTAG_RX) {
> + /* Push and remove the vlan tag */
> + u16 vlan_tag = ntohs(vlan_header->h_vlan_TCI);
> +
> + memmove(skb->data + VLAN_HLEN, skb->data, ETH_ALEN * 2);
> + skb_pull(skb, VLAN_HLEN);
> + __vlan_hwaccel_put_tag(skb,
> + htons(ETH_P_8021Q),
> + vlan_tag);
> + }
> +}
> +
> /* During a receive, the bd_rx.cur points to the current incoming buffer.
> * When we update through the ring, if the next incoming buffer has
> * not been given to the system, we just set the empty indicator,
> @@ -1812,19 +1828,9 @@ fec_enet_rx_queue(struct net_device *ndev, u16 queue_id, int budget)
> ebdp = (struct bufdesc_ex *)bdp;
>
> /* If this is a VLAN packet remove the VLAN Tag */
> - if ((ndev->features & NETIF_F_HW_VLAN_CTAG_RX) &&
> - fep->bufdesc_ex &&
> - (ebdp->cbd_esc & cpu_to_fec32(BD_ENET_RX_VLAN))) {
> - /* Push and remove the vlan tag */
> - struct vlan_ethhdr *vlan_header = skb_vlan_eth_hdr(skb);
> - u16 vlan_tag = ntohs(vlan_header->h_vlan_TCI);
> -
> - memmove(skb->data + VLAN_HLEN, skb->data, ETH_ALEN * 2);
> - skb_pull(skb, VLAN_HLEN);
> - __vlan_hwaccel_put_tag(skb,
> - htons(ETH_P_8021Q),
> - vlan_tag);
> - }
> + if (fep->bufdesc_ex &&
> + (ebdp->cbd_esc & cpu_to_fec32(BD_ENET_RX_VLAN)))
> + fec_enet_rx_vlan(ndev, skb);
>
> skb->protocol = eth_type_trans(skb, ndev);
>
>
> --
> 2.45.2
>
>