Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Vladimir Oltean <vladimir.oltean@nxp.com>
To:     netdev@vger.kernel.org
Cc:     "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>, Andrew Lunn <andrew@lunn.ch>,
        Florian Fainelli <f.fainelli@gmail.com>,
        linux-kernel@vger.kernel.org
Subject: [PATCH net-next 4/9] net: dsa: tag_ocelot: do not rely on skb_mac_header() for VLAN xmit
Date:   Thu, 23 Mar 2023 01:38:18 +0200
Message-Id: <20230322233823.1806736-5-vladimir.oltean@nxp.com>
In-Reply-To: <20230322233823.1806736-1-vladimir.oltean@nxp.com>
References: <20230322233823.1806736-1-vladimir.oltean@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ui1QyEv+Ene/tmOgOlofC2syhIIG2d3QJFLPrqYRqMbayDf7pQUcqDKXzI0G?=
 =?us-ascii?Q?tTTqQe05q3wqrg+fH5WeLkIIlYYdmH34yiw0pFsJh6SninBS/MkFSNxetKPy?=
 =?us-ascii?Q?HRmFwnELP3aQ8rcCPucH3U2BlXzEN4Zsu4z0xvZbJfF5r9VIKuxz1/J1ZVrp?=
 =?us-ascii?Q?EVwK994opFrCRDKCJaeuJ4HN6kDEjxCKpHQkID2a9W+9Xs5i7T2Ph3HNuXTK?=
 =?us-ascii?Q?KEhaLvR0dFtcC/JRvSi2vfTWaZ7qklil+NQiMnADyjQAe4dNScTjp2+YIGbx?=
 =?us-ascii?Q?faPD461Q5llt+H4CIyx+58NjhPUifiKemgOXMA05Ft/Xb062SeIorJKXuRUW?=
 =?us-ascii?Q?+94yTToqOKR2HIGdltV0G1tZuQhi3+hb89AgU7Nw8AlfDNrdmVb887FFj2kg?=
 =?us-ascii?Q?JJdP+2uoqWRJIHRSlEF4DSJgtF6CTH1BrAIBNqN8xZkclqRUb/ohdDwCFrrJ?=
 =?us-ascii?Q?qtEL1qERb/xqIJ+BVRrH0B0ssTtKBgWEX+fiGc2MmoCwy7eXERcaRcL5VviX?=
 =?us-ascii?Q?vPcVGxtIu+lsDGNMVIAdVxXe+wahfL08ezi9QREs9GIdNzXd+Qj9IMT2mZIN?=
 =?us-ascii?Q?zBslzl73BryBIEXed0eyitJ369Sq9F3LAPsugx2jvIiIiQy6IYjPlbn+EOtE?=
 =?us-ascii?Q?JoT4H794FaGTiROW0/7+Pw+HQpOMYcrDgv8CJTEa7JGqR7yIqkQY/ppqKn7m?=
 =?us-ascii?Q?LHl4oDUecLH+8QtaU0dJ0AYoM54MZCe2e96YQWHou0LTBUJV3lcpNFbEZv9+?=
 =?us-ascii?Q?SxY85woJbhJwlWhOyOYHnss98sLFEuQljICFx23+94vBo24wm1yk/6wEcxh4?=
 =?us-ascii?Q?6h/VcJIpsKsXT0NpBeese5Kh5+R2CL16Iu+k/D36cnRDiyWpF3P1MulRtNC9?=
 =?us-ascii?Q?gIXXTY3KkOaIj6G8uI3NDCpyPCslEUEvDYIF06atQaZJ4e27nm3nzal/QIF1?=
 =?us-ascii?Q?hN/B5oO3i4hfiCngQPlEI/TjKENA3YOycnZ7KPC+8Yy881FW8XeyL/8S0/NY?=
 =?us-ascii?Q?B4Co1WRz0KpozAqClJ7e8+JcoStodbuBDg1oMLguNDAstqEFViz1XCEMvrkT?=
 =?us-ascii?Q?vM5aS80JvPsxwzOS+Pf7Vqulxm/7HWsCvuT7jVd2bpXFacA7pB8pyYTWBSqI?=
 =?us-ascii?Q?huJRadH+/Xygis12uj8qdew3mQ7HPRNSpcGLLYGWHTfBu/XYkXRJoUFUTEUr?=
 =?us-ascii?Q?+ihPrmmfcNdS6r/R6etNb+0elS90iZMuIziDXdErsq4SqxmG3Dts+5MsTlnH?=
 =?us-ascii?Q?mW1g+OkVv/ii7Ziyi5cyNA6DYbK/GpMVrrkOOMToXcgOxiMAX7mC3ByZFIOT?=
 =?us-ascii?Q?Lofize4oE6EH1EH/6jTMZrw/vIR3FDwbPtafZLOVg0ANRnSZ4xtiaEwuEymG?=
 =?us-ascii?Q?Pre6vic+nWNZm1q/6Y5wtKNT/p4EYVhKO0QvCfBs4Z1Jfct+zbHWSOzxnSgh?=
 =?us-ascii?Q?l6Ft1yhxbxH34YzK0O957PFQBrkc8hj9KF35xDowkVvmlhJ5DXlxn1HpPO1r?=
 =?us-ascii?Q?GeADmY+7G4F0nibKOcF3/AkqzlbxdzliULl3VBZfvStc5Wmc/9e/syO+KqRL?=
 =?us-ascii?Q?3SjPRh91+wt41cPghcrnw8M3TDNIGo05wcvanJ0Y0hvkXRzQKgstrHn0jytG?=
 =?us-ascii?Q?2A=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e4ea8d63-45ff-4571-1735-08db2b2e9024
X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB6452.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Mar 2023 23:38:39.1393
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: niNLUr0SKpQTQe1dAQbWe/FtGaEmWuPAuzKK8km9esvbao4u0C7xB4QDZDsULbHgLHfI2+CAEGhF6/IaqguyXQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7263
X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
        DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,
        SPF_HELO_PASS,SPF_PASS,URIBL_BLOCKED autolearn=unavailable
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

skb_mac_header() will no longer be available in the TX path when
reverting commit 6d1ccff62780 ("net: reset mac header in
dev_start_xmit()"). As preparation for that, let's use
skb_vlan_eth_hdr() to get to the VLAN header instead, which assumes it's
located at skb->data (assumption which holds true here).

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
 net/dsa/tag_ocelot.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/dsa/tag_ocelot.c b/net/dsa/tag_ocelot.c
index 28ebecafdd24..73ee09de1a3a 100644
--- a/net/dsa/tag_ocelot.c
+++ b/net/dsa/tag_ocelot.c
@@ -26,7 +26,7 @@ static void ocelot_xmit_get_vlan_info(struct sk_buff *skb, struct dsa_port *dp,
 		return;
 	}
 
-	hdr = (struct vlan_ethhdr *)skb_mac_header(skb);
+	hdr = skb_vlan_eth_hdr(skb);
 	br_vlan_get_proto(br, &proto);
 
 	if (ntohs(hdr->h_vlan_proto) == proto) {
-- 
2.34.1