From nobody Thu Oct 9 16:36:01 2025 Received: from glittertind.blackshift.org (glittertind.blackshift.org [116.203.23.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2A0EA28D85F for ; Tue, 17 Jun 2025 13:25:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=116.203.23.228 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750166738; cv=none; b=Vq7sCZL4kJ7muZUfraZM78YhriwsnnJgEG3lS239+BZTiPo00sn12XbPULSsBAqanDbq06+CHJvgNeHKxC6iFxBvbkaNwQ0F/MI0iPoZaZilvgAnab8iwt0sU2MSV4Svb14QdIRWIqY6gzzINyUYJtF8DUCssCb8I5Vz+e4MXHE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750166738; c=relaxed/simple; bh=fQ4LxAZsa4WZr7runtQggvEmU2rQ7E01a9lhK4ivd8k=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=VHJW3FDtzkJrJA0NCx8ilCKlcqpciVk1/7bweCZkGASNu9lwk+HwcciS/o0KpOPdq89lXCmfPWjRc2E4lLOCTeAcn0W3Enp7sqckZs95nCxSY1d/DVLJO48q9oRB7xKelvu1Q2PiQTPez6a4Y0ChYI9u6qhFfjVyO8ZCKrZ8Vqw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de; spf=none smtp.mailfrom=hardanger.blackshift.org; arc=none smtp.client-ip=116.203.23.228 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=hardanger.blackshift.org Received: from bjornoya.blackshift.org (unknown [IPv6:2003:e3:7f3d:bb00:e2bf:c3f2:96ab:885d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "bjornoya.blackshift.org", Issuer "R10" (verified OK)) by glittertind.blackshift.org (Postfix) with ESMTPS id 1C78266ED68 for ; Tue, 17 Jun 2025 13:25:29 +0000 (UTC) Received: from dspam.blackshift.org (localhost [127.0.0.1]) by bjornoya.blackshift.org (Postfix) with SMTP id E194A42A84E for ; Tue, 17 Jun 2025 13:25:28 +0000 (UTC) Received: from hardanger.blackshift.org (unknown [172.20.34.65]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by bjornoya.blackshift.org (Postfix) with ESMTPS id 74B3342A7B9; Tue, 17 Jun 2025 13:25:22 +0000 (UTC) Received: from hardanger.blackshift.org (localhost [::1]) by hardanger.blackshift.org (OpenSMTPD) with ESMTP id c7ff7475; Tue, 17 Jun 2025 13:25:20 +0000 (UTC) From: Marc Kleine-Budde Date: Tue, 17 Jun 2025 15:25:00 +0200 Subject: [PATCH net-next v3 10/10] net: fec: fec_enet_rx_queue(): factor out VLAN handling into separate function fec_enet_rx_vlan() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250617-fec-cleanups-v3-10-a57bfb38993f@pengutronix.de> References: <20250617-fec-cleanups-v3-0-a57bfb38993f@pengutronix.de> In-Reply-To: <20250617-fec-cleanups-v3-0-a57bfb38993f@pengutronix.de> To: Wei Fang , Shenwei Wang , Clark Wang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Richard Cochran , Andrew Lunn Cc: imx@lists.linux.dev, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@pengutronix.de, Marc Kleine-Budde , Frank Li X-Mailer: b4 0.15-dev-6f78e X-Developer-Signature: v=1; a=openpgp-sha256; l=2287; i=mkl@pengutronix.de; h=from:subject:message-id; bh=fQ4LxAZsa4WZr7runtQggvEmU2rQ7E01a9lhK4ivd8k=; b=owEBbQGS/pANAwAKAQx0Zd/5kJGcAcsmYgBoUWy+yiMoeNV/nrWhL7BADIeRU2sAiW0B5gxxk RFRkAewp9+JATMEAAEKAB0WIQSf+wzYr2eoX/wVbPMMdGXf+ZCRnAUCaFFsvgAKCRAMdGXf+ZCR nOeSB/9u4MKgbtCB1vOWwZM+ZO3wzS8kw7KW343LNISPRQR58GfBA9j+rBwZPgxmna3yckCrLEI zJ1NvZdLqSeQgN4dd1HGxv47iI0iUHGbqAgT2GkZX4ug4TUVIoFO8U9FrIhEc84dC6jHsZ3Dc0M /VT6W7pPi7XPmDrSXB+Lm+g1DIjaEj3X9rRc/4clBX73C70AYphJUU72sxdCGHkWNp7RA8HYCaz 8o18wI5mKPH+ethW64it2evqi/FE3qaKcHOhbOq0NFK3sgBBW5IFp7gWMPZfRlt41bX89O3haxS u0MmewuStFTzHycZbfnD2XTTEMyOyg4YvLkD/cia333RrHBe X-Developer-Key: i=mkl@pengutronix.de; a=openpgp; fpr=C1400BA0B3989E6FBC7D5B5C2B5EE211C58AEA54 In order to clean up of the VLAN handling, factor out the VLAN handling into separate function fec_enet_rx_vlan(). Reviewed-by: Frank Li Signed-off-by: Marc Kleine-Budde --- 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/ethern= et/freescale/fec_main.c index 021cf7c2dcf6..24dd1b280da0 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -1707,6 +1707,22 @@ fec_enet_run_xdp(struct fec_enet_private *fep, struc= t bpf_prog *prog, return ret; } =20 +static void fec_enet_rx_vlan(const struct net_device *ndev, struct sk_buff= *skb) +{ + if (ndev->features & NETIF_F_HW_VLAN_CTAG_RX) { + const struct vlan_ethhdr *vlan_header =3D skb_vlan_eth_hdr(skb); + const u16 vlan_tag =3D ntohs(vlan_header->h_vlan_TCI); + + /* Push and remove the vlan tag */ + + 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, @@ -1853,19 +1869,9 @@ fec_enet_rx_queue(struct net_device *ndev, u16 queue= _id, int budget) ebdp =3D (struct bufdesc_ex *)bdp; =20 /* 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 =3D skb_vlan_eth_hdr(skb); - u16 vlan_tag =3D 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); =20 skb->protocol =3D eth_type_trans(skb, ndev); =20 --=20 2.47.2