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 7/9] net: dsa: tag_sja1105: replace skb_mac_header() with vlan_eth_hdr()
Date:   Fri, 21 Apr 2023 01:55:59 +0300
Message-Id: <20230420225601.2358327-8-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?kFTG3VWyKjJ/OEwdx58yfskuzYk4slUOhKwvj4LCgz4pHSgFCUKEt7EY5j9X?=
 =?us-ascii?Q?3IZbHDIMJ+ty/hPNRZdG2ih9OdrsIblL9K/LkFdCJ55RWmIzvSZu0sNbzRMT?=
 =?us-ascii?Q?y/bCT+Pnl2TbuQl00olS4LICmvGtW4FeKk4vowodG88QV3Xye5pjceYtdJZo?=
 =?us-ascii?Q?NPJxUgeoEWn0e4y0gyKDkFbET6sMCT7Fjotp261pJS00eqxQFtW56S7HMY9q?=
 =?us-ascii?Q?T8Fm5cd9cFiHfqWXOdVR3QdBdyUTV8P0c07xJ3Bgm6ySL6tv1uB7v87R4GQK?=
 =?us-ascii?Q?iKNz+7gxAjAWbNyfwlug545tIo5XC8FSylKdp/YjE0ru6n84pNII+eyTIn0R?=
 =?us-ascii?Q?aFMSmEDNihYHyjW0TN7FwjlU2NVXNU2QFB0ju1RjLV6ZDZRQWgFOkZ9MpjGv?=
 =?us-ascii?Q?3o/aPGExbjXQaCVuHFaFCKvoN+TPj/NL+kFFRIOgVcgmRFZdYQv7ttvsMLCE?=
 =?us-ascii?Q?GY/YkZ+HgMPi+TFFOdzYRqDAqrjlE09yGZPn4/tn5AVPIs8aaI0vxiry+GJ6?=
 =?us-ascii?Q?RaZoLofgIk8xjosTVxkgvPOms+NhU9jOc467JBFRkMiXZsyNRgc6cEjBoGRK?=
 =?us-ascii?Q?OWvlej+ofuVcwiKyFj0+QcZL9qw1MSmCoQ364hRh98pgrPCfNRrtdPOWFsrM?=
 =?us-ascii?Q?SZZX4sfFnT3SUQTDppzIuIT0c1GzsAVvVKDO6EMEIjfiC8v8Qa7IPg3qFuuC?=
 =?us-ascii?Q?PYI9enkoQ2XvDHxxqE5vGyBtY1hs5UzV6ugcZY227S0xTvklNekSwbvVh07f?=
 =?us-ascii?Q?945XNRcg4Nd+amHFV0+5joCfwQLnLHf9oX45VxhhbR1SfECbaEQpQ9D7PJD5?=
 =?us-ascii?Q?1rLePVPznM4lL7X7WEG9mj98iIbhvUE7haTkUa4kHNyoZuNae/0KFdGQ3VX9?=
 =?us-ascii?Q?pXxIewxTRNx9GLR4jseuBWW4r6rw86LF3BBfoUX+eKW4hPIMNZ2/MvmBRXBC?=
 =?us-ascii?Q?xQJ8xf+7Ppi0WIo4WNwIZ8+9W33W3isypZrwgbQQO7NBeBPu1xoUGbuIgBzB?=
 =?us-ascii?Q?Lffs+S0UhG7v37mHhUguJ4mBrO53GGI6nkZGfCsgCCH3aR3whPYc8xLwpJ5x?=
 =?us-ascii?Q?NOtq+8tLlOVr1ypFQHzlbapMAP0TNFmUKn/legloSzrv/9FLJUSlpj3gYTFH?=
 =?us-ascii?Q?BBc6HZakv9v2Y9BaN7jFom+SD2qXrANeKBUpxfP6ToXvdKT7OaQ6QHnMwHES?=
 =?us-ascii?Q?s7M313pBIalusHKgjCdvHIDBZnoJgQ4weLaO6oLslIesJBpdK12ZqBxj2KLM?=
 =?us-ascii?Q?0mVR1ElqrYFkH2fCu51eI+fC7kvPUSNFv/X7SWTuzSnWZu3Uclbo8hWZnL13?=
 =?us-ascii?Q?RpqwDGajzTXyNwUKyHKbVLDHOwk6X9/WGbzTnUjDomAMZ1+TMQISzyqUM9OT?=
 =?us-ascii?Q?TGowJyhU1+PdJ4GNRsZ3xACcwe4ojqR4B6xF9MIQ46aszMeVOqm3xEAzihWQ?=
 =?us-ascii?Q?aiWoWvtRi6cHgvDxfPMfs4q7CtrLtVflvWcy2L1KyhTbwgAliXnZyJ+AoJN5?=
 =?us-ascii?Q?G/+z7WUdpQfWJfEPk4fWK3IgKjTHMerqqH7ZxCEe8e2Ovie9EaUVvUodefhv?=
 =?us-ascii?Q?J3K/R/N/H2a3id07BVjuKJfILd6xM0rd7uP6SkuDTCPnk10LH4zVsRduKG+D?=
 =?us-ascii?Q?9A=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 123f41be-90d4-4d09-57c0-08db41f27324
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:17.4071
 (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: gy8e903hwW4gZYRRxkF+G7Ym2CEXgx9a4tINcMIxXxplUi+EJnlDLh7QR0zVICRLFn4IMRqjp3TuUNn+oZEsXQ==
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

This is a cosmetic patch which consolidates the code to use the helper
function offered by if_vlan.h.

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 a7ca97b7ac9e..a5f3b73da417 100644
--- a/net/dsa/tag_sja1105.c
+++ b/net/dsa/tag_sja1105.c
@@ -516,7 +516,7 @@ static bool sja1110_skb_has_inband_control_extension(const struct sk_buff *skb)
 static void sja1105_vlan_rcv(struct sk_buff *skb, int *source_port,
 			     int *switch_id, int *vbid, u16 *vid)
 {
-	struct vlan_ethhdr *hdr = (struct vlan_ethhdr *)skb_mac_header(skb);
+	struct vlan_ethhdr *hdr = vlan_eth_hdr(skb);
 	u16 vlan_tci;
 
 	if (skb_vlan_tag_present(skb))
-- 
2.34.1