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,
        Simon Horman <simon.horman@corigine.com>
Subject: [PATCH v2 net-next 6/9] net: dsa: tag_sja1105: don't rely on skb_mac_header() in TX paths
Date:   Fri, 21 Apr 2023 01:55:58 +0300
Message-Id: <20230420225601.2358327-7-vladimir.oltean@nxp.com>
In-Reply-To: <20230420225601.2358327-1-vladimir.oltean@nxp.com>
References: <20230420225601.2358327-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?ZTEYxNjFY12egojz2UCm9Jx/r02oa4gy812gN4PHwqkvVsu4I4WQcuU4kY0I?=
 =?us-ascii?Q?IpJgCazThml2bYgqHBwL+7zX1zvu6zHa2I3f3EFDMC6XdeMryaXSh1FRJQi2?=
 =?us-ascii?Q?H2lQLMAdgAv6SviIapkNGzbs4FjqcJ3LiHcuS6C+iskCedWiaX0Q1X/3irxq?=
 =?us-ascii?Q?BRUN9OKKqugdvKFA6x6OcEaFoZ7WjZuBudKm9eNqURGeiFu6EhenyG7NJMqp?=
 =?us-ascii?Q?5C+p7ymw70TuSljGkis172zBJbiR0cpg6ARkCwBm4XGefw8BZ/gtBpRchCuG?=
 =?us-ascii?Q?V9W/2dkYDlJiX3OL/n/+MjkT1qtvCabhV5euuDqdM5WFPVkkUqgnX4hp9+qV?=
 =?us-ascii?Q?+nm2y3e9+CilLVHiKfz/ulvDxqnVnysQvsB82P+aff7ygSKyiDrzkh9C6SXn?=
 =?us-ascii?Q?OIe/JHIniQpZNlgoxlhDphZ80RqCXKuc7XneuTnJWL2CKVQ+TlVIUHtdcHqi?=
 =?us-ascii?Q?3rvzDV0TiTYwAqJ/zUVzKQbCx9l4zWoQMMCTn9DWYgwsz/5N5OtWJ3t88Thy?=
 =?us-ascii?Q?xkjl/L/xSIoA2PQgjcVuaTaqEYz3v59AHhHDxPA4+Eo2TK772WaJHyFgqnRE?=
 =?us-ascii?Q?XofWDJkeUNPIQNpewYHKlugTjniwQZMGi3zgU4He1qIPMCXGHeJvK3FyONMT?=
 =?us-ascii?Q?JgtaFnqOCZlFJGbHsyS58FS4XtVuILjpPR7mt1PS/zUXJVzideeW9zD1rBcf?=
 =?us-ascii?Q?IZuImqx7kBVzsr9Z0JXVIcrcNd3NOC533gGrJdDuG1jkGZAUoQt7YLe2ErL5?=
 =?us-ascii?Q?KWfkLi00kmBqm/hDUsKDnEINBUfJst8wjtb2YhZnEmWvRTK0iQgerobg+RrA?=
 =?us-ascii?Q?P1brcorvPpuW8h2e1oxRKEu2bXJS82NCg7ESFIbeNW0gtYwLPioximmkTgo0?=
 =?us-ascii?Q?+VTm7bOjNEjsbHX81yuczPoEI/u8zt5oEO6d61/XBEzwD0DgEQITZBFcxchQ?=
 =?us-ascii?Q?SpZ1nJsPJx+jA4UZ8QtIO7zgHoG+cPFpn8judCQVdOSRhb9SXd4fULD/tK7s?=
 =?us-ascii?Q?hw6ac2x/FR+LPOHHAXsh45dqPmFj9uTA9qmjBsZ6AKJlGErDr7KqdxkptXIy?=
 =?us-ascii?Q?0QKnpda9mdJEAbG8zCuCpLisTMgtME3L4TGvsH5eHhH+tsRW2J1mT++f52FU?=
 =?us-ascii?Q?hViEH7m7HfexdI/1ozNQAArOPxAqqJ1HtdY4GWSSi1Dxi0i/Cur2AfnP6JDV?=
 =?us-ascii?Q?WJovv+2xr0hlbMlDK2wVXp4yfozVYPMlSwdvdoDJ0NFfaCLmYY20inQHPuPA?=
 =?us-ascii?Q?OX5d1doC/2X51oYCk7b0jIx76Y/Ku+7N1ICdDJYe8Umk3owOAKrQ+ftDXlBq?=
 =?us-ascii?Q?LaXlW4PkrrrC6NDMV8RgY6LnmSzTuCpwliqGR3JYVwkpqvjgz4FfZvA+PjzT?=
 =?us-ascii?Q?0h0CBQY9B/9hq4aV5EIpPdtKgWb1P+YZIG+vdPKRcu6bWifqhCGOsiRbe+Z/?=
 =?us-ascii?Q?WGux7LaYC3A0X+vW2xbAeuIsq9LUdjSKSWd8baPZqzHBCMOM3cklk3rPugs5?=
 =?us-ascii?Q?blCSPlLghopAbra9oxjai2zHkah1sTdGy136g4URYZDdViY5B2c08o0Kyk1O?=
 =?us-ascii?Q?/rvaZE+NabDEW+5cbThbW6srSHjp+XJDbPWaYz2iRqZ6jojS8UjqXsIsTbYV?=
 =?us-ascii?Q?tg=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ef59bcb2-7054-40f1-4a96-08db41f272b4
X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB6452.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2023 22:56:16.6735
 (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: R36w6X+fGlhtpxxktOB3Ap+z0p2ZBRVhRnRjC4kJqQIzOFrGUafgLq0pWMRvR1uq29d3cp2pJElwY7EAUvI7fg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR04MB9213
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=ham 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>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
---
 net/dsa/tag_sja1105.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/dsa/tag_sja1105.c b/net/dsa/tag_sja1105.c
index 1c2ceba4771b..a7ca97b7ac9e 100644
--- a/net/dsa/tag_sja1105.c
+++ b/net/dsa/tag_sja1105.c
@@ -256,7 +256,7 @@ static struct sk_buff *sja1105_pvid_tag_control_pkt(struct dsa_port *dp,
 			return NULL;
 	}
 
-	hdr = (struct vlan_ethhdr *)skb_mac_header(skb);
+	hdr = skb_vlan_eth_hdr(skb);
 
 	/* If skb is already VLAN-tagged, leave that VLAN ID in place */
 	if (hdr->h_vlan_proto == xmit_tpid)
-- 
2.34.1