From nobody Sat Oct 11 00:28:59 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 48E3724886F for ; Thu, 12 Jun 2025 14:16:31 +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=1749737793; cv=none; b=KI5ftAYZaC6IRColEZerL1+cdWqI0f+xTq5bnStQdK0xphaTFSsMKmOCqCxpkgvBjlHMFRw9O1CfSpZZz46OGl5V4XtIP/Sg82soC760RYYPP124YYldJfPKScUKqYamMoCuz0nBv+1lWF/gk5YXMuscCc1cAJ/HbkQvrkk8x3U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749737793; c=relaxed/simple; bh=KcSHw1b30IZrtNMUrCtQ6+yKA56AmY/dp9ME1hDmxyU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=DyN0Mj6fE575anLq3/K63V2swWK3UfgShDm32ebyGCLYPkfMrfEVff5ptnE1JAvMPwLMQyCFHUD6U6ZGh91eUUhwFE5PbLzS9rg5L1+jsOPYXIlAy3R4daxyE2qW4+GfS7E0NStFSIIMG+/z2HOrZREMQvI7hUR6yBG65s2GhVg= 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:e75c:5124:23a3:4f62]) (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 855EB66BC12 for ; Thu, 12 Jun 2025 14:16:25 +0000 (UTC) Received: from dspam.blackshift.org (localhost [127.0.0.1]) by bjornoya.blackshift.org (Postfix) with SMTP id 506464264C3 for ; Thu, 12 Jun 2025 14:16:25 +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 C82C742642D; Thu, 12 Jun 2025 14:16:18 +0000 (UTC) Received: from hardanger.blackshift.org (localhost [::1]) by hardanger.blackshift.org (OpenSMTPD) with ESMTP id 445b6bb7; Thu, 12 Jun 2025 14:16:17 +0000 (UTC) From: Marc Kleine-Budde Date: Thu, 12 Jun 2025 16:16:00 +0200 Subject: [PATCH net-next v2 07/10] net: fec: fec_enet_rx_queue(): replace manual VLAN header calculation with skb_vlan_eth_hdr() 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: <20250612-fec-cleanups-v2-7-ae7c36df185e@pengutronix.de> References: <20250612-fec-cleanups-v2-0-ae7c36df185e@pengutronix.de> In-Reply-To: <20250612-fec-cleanups-v2-0-ae7c36df185e@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=1086; i=mkl@pengutronix.de; h=from:subject:message-id; bh=KcSHw1b30IZrtNMUrCtQ6+yKA56AmY/dp9ME1hDmxyU=; b=owEBbQGS/pANAwAKAQx0Zd/5kJGcAcsmYgBoSuEpFhwQUjyuruadsyF86whxVy4NTFg7Z7ysd NxXeVkc+1GJATMEAAEKAB0WIQSf+wzYr2eoX/wVbPMMdGXf+ZCRnAUCaErhKQAKCRAMdGXf+ZCR nNXcB/9ulSM9ha3AJbDn7/PRdbxjWITgGjRa+5wsops1wQjhWz7+dnAUI0H16zzy/5AS44J8dC1 wWgNkLImEGj1nm4FYbKMZIUsQm43bj8YPEwwcUgSqPI5UYg3PKB3QaQN6MORWURLJO7Ja2pGqAK IUbb2dcF1M4buUEARxrW8W/jYQgMxlXZkyvhWAj+bjU1HQU+K/FeQicBn0wOzI+Zo16+wFXBNCp jvsUo7MNLk1xGu8oaI4v5kb/UD1WtIifPfvrxoO/RlwiVDR+YZfCj2VNuuxgnTgryR6pYXvPshq EQ+fi38ngGRVixBt8EdjOndsWa4UlM//PxQJ7Hx3FW4rs0L5 X-Developer-Key: i=mkl@pengutronix.de; a=openpgp; fpr=C1400BA0B3989E6FBC7D5B5C2B5EE211C58AEA54 Use the provided helper function skb_vlan_eth_hdr() to replace manual VLAN header calculation for better readability and maintainability. Reviewed-by: Frank Li Reviewed-by: Wei Fang Signed-off-by: Marc Kleine-Budde --- drivers/net/ethernet/freescale/fec_main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethern= et/freescale/fec_main.c index 6b456372de9a..f238cb60aa65 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -1860,8 +1860,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 =3D - (struct vlan_hdr *) (data + ETH_HLEN); + struct vlan_ethhdr *vlan_header =3D skb_vlan_eth_hdr(skb); vlan_tag =3D ntohs(vlan_header->h_vlan_TCI); =20 vlan_packet_rcvd =3D true; --=20 2.47.2