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 6/9] net: dsa: tag_sja1105: don't rely on skb_mac_header() in TX paths
Date:   Thu, 23 Mar 2023 01:38:20 +0200
Message-Id: <20230322233823.1806736-7-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?MOFnQdWMeNquhs/DbxylVnS/HVsfon2Lco7boXhpWYWDIjwXIyU8feE7AIIv?=
 =?us-ascii?Q?EH63zc9uOcF7PJvBlvzrxZrPCP68eK4F01xzXthF67XdhzdnaMN3pFtviS8e?=
 =?us-ascii?Q?ux07VaNG0RQZFB6eMfYoN9ZcxUfIgf6M1g+XbqucCPt9tqdsqLlURq/7oI9o?=
 =?us-ascii?Q?AWT56BAj7RphuX1SwdfPw5QALiv6s6lfp2E5/caZJYgPly7WCZtWd0OW6ylE?=
 =?us-ascii?Q?SmxFkzSRwQIFJPlCwE6kmJftn6NKeOInmEqiq9WgWo1J4UjaiAr3tUGxewh2?=
 =?us-ascii?Q?PQE/0yoDuxj6lQrUVIWNbUw0OmgpfGjZ+qjL/S7Gu6NEE7U8bacjDtEmJ6O9?=
 =?us-ascii?Q?xnjkDV3+uj1vr2eISuusxhy6JP1eCVbxM7H9u07ipsx1vqKmJqJUemjpguR+?=
 =?us-ascii?Q?sMY7F+2Nu006dseT2kZdxcCw+54aobvUpEvqxEbaLkDcgDFb+I3Thlnow/wd?=
 =?us-ascii?Q?iPLPjeOl5tOi6ZqGbJ98PBWCWr8rZ7wvSnib0HKPdCrqYvqPW0d4gaW8KjCN?=
 =?us-ascii?Q?VYyRhssMFUHtlZ6yvKOeK88wZoGMdECrrKtE9wwYAoUCW7cbrnjj1gJbz0j4?=
 =?us-ascii?Q?3UIb1KZ3k9r3p9vylbfa1JHjS1q+QIsFzcsOWb4+i3LqUn9OKYPU361v7aih?=
 =?us-ascii?Q?qONqnojrfUmgTG3WxlpUADmzGP51+bEerVfTbYtsq/TBViAyotVe+cuvN6J0?=
 =?us-ascii?Q?cTVZcLLUv3lcVxODyHizW8/DTNjlquiWIpEBk7DTCfk/zEV9jVTgwa8O89qu?=
 =?us-ascii?Q?dSVEh+mpxVoL21T1cDMh/whmbKkc2plr4Q/pjxGA29pIf780n7KR4xcpmxaH?=
 =?us-ascii?Q?iOdtx+qHyGO670a/B7NpsnIc5QswIAvJL4BolIuSu8cnOqG0qj1O5UFhkMEW?=
 =?us-ascii?Q?aKJsJhSiCR24heyJkfUiGDxLwuIePcJEdQew1TAufiACID5XJAhfMH7ZLpHY?=
 =?us-ascii?Q?CVlpaUIk9anhRYIJyDmNvIgizRjfF1GqhIDp/ydXV5Z9Pk/diT4nouYJS00Q?=
 =?us-ascii?Q?oS/tidHw28Ntx2EcxkvoFn64Dd7RwvLUauJHPYJXphX+2XUj7EusM26cbQoj?=
 =?us-ascii?Q?EM02y3blaNA7g3nogT5l/OTsGR49O99Nf1U63b7o3HMDBa7J53AqRRuR5j8l?=
 =?us-ascii?Q?sVeAvcM36MpizFXTYRMsvr1G4F48UsMBRZr0Oaka3maxPVfygarHT5mDC40J?=
 =?us-ascii?Q?LlnrrjPuBZ4w/bfJ60ING90HSei/Sla+laB9qWMJGS11mvmzKfIQ4z8jIgFb?=
 =?us-ascii?Q?zpSfGOwYU61mkdlajZB9b+PlZXfz6AFRe02s0iqvWLnb+fj9OxkbilEJ6x91?=
 =?us-ascii?Q?DHUohEr6ngVfwPoPTK4NTHxWVV3TNWHMI9GbpYi0ITQIV+GrNE36YxKXt0Jo?=
 =?us-ascii?Q?20HV1aTsU6fzmvgBP5syUcxIZnvD1tcZU8zWG8ad/ZLhBIbdvUZu0YTVJ9ca?=
 =?us-ascii?Q?zAMY9ANjB0KYtWDaTdbAEX6r5dqAJFXaw+Vxu3QpRYpE8sYXXnRtZ/e2F6fY?=
 =?us-ascii?Q?CmTiNJqXupZ3HCe3SDDv6i3ewqKDVy/Iov1Im1/J66QjgUqDr5allWvxthzk?=
 =?us-ascii?Q?Kld43Acv0kOjNr3TWOY52bE463jQOjdUokmKdKQpgN3NGW2w+C1L5hq0/ONu?=
 =?us-ascii?Q?9w=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 26f6f6d2-24cd-40fe-ba01-08db2b2e910d
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:40.6549
 (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: dTpbyWDKq3sDrrTeR74HpG3/4q1fNiHOOeaNhfx9kGAOvaWiiS8eNgOPOFBlD+R0Wnft7OJkfqspFEWzntV+BA==
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_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