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 7/9] net: dsa: tag_sja1105: replace skb_mac_header() with vlan_eth_hdr()
Date:   Thu, 23 Mar 2023 01:38:21 +0200
Message-Id: <20230322233823.1806736-8-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?M9hSRw6z7hqpmuGVB21ws40W2rBM9DHJT9Kkoxyz1aAxHqAsNninjobNYrRR?=
 =?us-ascii?Q?PIyWTLiGx6FeW5RdLE2nzs6qAA3ZYHKuRYC6RB/he4CNZGXNi93mij8kIJy1?=
 =?us-ascii?Q?8y5Axw93V8UEdYaQhNwCwznX7/YSZvgXRREYlK4xev9Ch495XfbO0TerG/H6?=
 =?us-ascii?Q?GNLR426WxwaOI/TBXEOweuMjmf3qbZqDbLi9FnluOcTmXaiGDB8/gJ1Qh68b?=
 =?us-ascii?Q?wNnZeoNsTwrRn5tacorqgi4xN+mllDvejqEtLJEIq7xIqiezVQDjYKAjlzyo?=
 =?us-ascii?Q?W7MKWrybca4dxufA1QMjsNjRSYZhQYCFHvAKukNuwfX3jkUPNWF0JCY273j9?=
 =?us-ascii?Q?ldDWrQcoR1H/OUZGftJZLIumrxEJj7yrmqWyBkdEj/r+1ju13+iqm+TIthAp?=
 =?us-ascii?Q?+GwjzWqUBY4HmpeyGe1Vf7ghrMTLHTChGmiHjcKYWIeWf0dtvbXPNd44ioMS?=
 =?us-ascii?Q?AxMCSnBQXctykEhlzd1iuh30Iqy3COLn5F9lw9QTawR/FSxdQZF2SESe1Zzl?=
 =?us-ascii?Q?VQnI4LS2iWJcdJ83Eo32Oe2JzOfYmGN/QGhazFQ2nRuwAcV4JP8JB0qVJyOx?=
 =?us-ascii?Q?vlPSgvoXBjpkeEKTCTfTcBzzrWK2+FaLQh09S9PAekGDt6ucw8kMWs36sb7I?=
 =?us-ascii?Q?D78beWTr0W5KvKUaM8aMO8ND0hq0uyGzihujcyvM13+PeJvZMMh8Y2h+O9+J?=
 =?us-ascii?Q?C0XqsnwsuFHpGRsae42CPA+C1dJMrbQJ4LRjZY2UJRg1by5aT9By1FLeqdY9?=
 =?us-ascii?Q?fknQKHJfl7z0zktYLOEoiBqrZD/zzgTPXoXLQCz7QtrbYn6XO6Ghe+uP3ZsX?=
 =?us-ascii?Q?rV0gsoJvbFfu8lfm7BBdi3LHZonS/uHY0pbs2FAIGM9EOdJjfuZ9EJ13C/JA?=
 =?us-ascii?Q?OHpnGo0eYV2ZxQ+2pylPNNvtG7AtlXfoERj1Hv5FXGL6NXdevLjYnuN5ujwH?=
 =?us-ascii?Q?5hK1w72kksqmzUQPFsyHhhTWRBy5xWL9I0u780esan6Ig6P2q3B1/lDNOc/U?=
 =?us-ascii?Q?rBj8u151iNwdriJRkyn0xhEqDMQ7T8ystGEyJ+NKgZr3sXM/TXMva/AW+TC8?=
 =?us-ascii?Q?+wLR31U48Im8EKDFhPKRWU/mVPNGU0R3NMc9cKZo2H4ldG6Nl4OfN9JiMisi?=
 =?us-ascii?Q?8toY63lGK8zBJ6b6jCfi//uutJPtl+VZPuwRdvhP5gZ8CwtSxxDEYyAEBoSr?=
 =?us-ascii?Q?oacOb94E4NWNTJbA6CQlq4PjPLRxFmtd1cgfbwV7+yZj3nZVDWK3MlQuQoUQ?=
 =?us-ascii?Q?BlLmuPsdrAXCYnqcNAfk0fEKPPYp2GLu+wQyz5cbOxNBr8kdnLsIEo3ojSro?=
 =?us-ascii?Q?VpCgk8Ne7DwXZKt91QvtB8ANlMIlRxc9SnZdCnYIizEd5ItvufTgZxCue1rh?=
 =?us-ascii?Q?Ix9fLKZbM+1lJlW3K7UMK91FGcA9j0jPu9p+6Hcpi826IyAHbCGBWWwprkty?=
 =?us-ascii?Q?7/8gdgn8yIgYd4EMeijbNbpHopeMFhJdOWY0Dlx3OW8EwmO9LLBl80LuTf/q?=
 =?us-ascii?Q?Omy+CsJrThC0V0dDkRfg0r4AO4qUR+EHGe6lws5sAhIdZmryegn89ErcodBP?=
 =?us-ascii?Q?voZ/zvCllhIQmUS258FWxaJmDYFPdzABAgdwva1W1lQunTy7t4O3HyTVnpc+?=
 =?us-ascii?Q?zg=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 50fc0560-2364-4c5b-647f-08db2b2e917b
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:41.4048
 (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: ACP8B4TclMQtcZpgPfz2vtkRS+hOheFa5wQBlC9yPvmFg9WYFVcyQvjH45FOcz61NapoD8ABI/lM20qusezpJQ==
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

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>
---
 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