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 8/9] net: dsa: update TX path comments to not mention skb_mac_header()
Date:   Thu, 23 Mar 2023 01:38:22 +0200
Message-Id: <20230322233823.1806736-9-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?7XIwkc63rmRZcMdIhMoDMPYmSodKViKJCVeYzIjP23kLDSt6HpUStzAkg8Uq?=
 =?us-ascii?Q?URms3E7ncHs2pTI/sxIAF2Mdt0WOEBL7mPo3ooguUpzPSuLyQ0B9yAVWiMkN?=
 =?us-ascii?Q?hAZPh/KgasrqtZ5eusFLw3c8K4qecNCY5KT/nsdhbpsWE21vLmD4epjqH7GS?=
 =?us-ascii?Q?+MRAphSYeomFXo5TM3X5Mudv23+sm0LgUHPvsrVjsaM27jHCNTrHOSgf/nOK?=
 =?us-ascii?Q?n+l8ujRwa7k3PtLP5RKoOne8VFL1IA9TxoGmM/w1Q6mUM7zBSKAv7FQxN17G?=
 =?us-ascii?Q?CxB01UceTTj8y3l4fcFOHT6j7K/thp0a+YLT9/guKVfPHABjN4rgShhrtPDg?=
 =?us-ascii?Q?o5hO2tARffjaRDbZyJmUC7dKxr4LJo0drNSrdIz+zJmoBn1gmfQY7jWBc0xc?=
 =?us-ascii?Q?04Hjfpq3iD9Hi7nb8ltVepuIektO72ae3LHg8asaNyPgs/vCL24/MAXaKv57?=
 =?us-ascii?Q?Mv9b1sc3n7G3/muuhyJWIVT4YQtImCnnnyb7icwoMH2hf5vD9iJtyaFLm9cJ?=
 =?us-ascii?Q?uujK5pkc4hVLTVU1f72GQG6The5bJ7A36p4TgAR0eCein3VPcLlXiFp+dFt8?=
 =?us-ascii?Q?1UtZhsHVuDPn8tMXl6wq5LaAMkmpH5qVB//slA3VUDh2Myd0+SnjRZXB+9nL?=
 =?us-ascii?Q?qIp7E1PNSIbrb/CmBDK6lmF8RYEWftotbQ/GB2OxhJDrJBus3BeLPrmkr7wU?=
 =?us-ascii?Q?Do3j5hZ6/apTpOKa5fpGoYWQ1PX5RMDtggO9zWCTaMf84LK4bqOViiN69Lvk?=
 =?us-ascii?Q?he7W3QNDVfk0XKFkYP8GaD3UK+9X/KvK+ZrqVyew7QEhsGYuHLYkdBbCLH+b?=
 =?us-ascii?Q?H6ZHR9a8h1wXwsAaJI0VrQ7j1h0/drLY/XtjSkeE+x0srmuCr882AGK4M4yi?=
 =?us-ascii?Q?2NfRuJRs2TZ4hJizLsGejW0t7h4m3uzVCIPem4cvO9hg4lM+begSiX0mBZX3?=
 =?us-ascii?Q?NsOzRcZ19uV+lCs7o3xPi0USvHTcHtl6KjmXAkDapAMNfPAeRtqLI3If64l2?=
 =?us-ascii?Q?V7c+H3r5yCb//1Ql4qUzdUC4PpRPkgfR5AAobRvSzxQ50sMDMWTx2g39y119?=
 =?us-ascii?Q?lJydGq4tNXikrvu24eGjPKFRV/LZkvDsvOphmRSPxapG6GUlxzuiQFGCawdc?=
 =?us-ascii?Q?VIiCVIm0MdgRacBXvj+5XEy97gRKzDqZhi1rwgG1SH2GbVElZnwD/3dcEjUY?=
 =?us-ascii?Q?O1ehvjxMotsRAW+u9d0p6Y1DjlZNWuDvYXcoimt2OncQUqedQG6KJeLxoUS7?=
 =?us-ascii?Q?ZCdkOeWV5Ev2qAdyJKsfQqgxY6i9bazao83li6WQ7eugvN2filheFxy2nUhU?=
 =?us-ascii?Q?W9oZGifWwNI0Y70L+muTJcEf55m6Rj9mhpLF4krvxijU4HPk8EP4Ex4YTAPM?=
 =?us-ascii?Q?mI+kz14Dz7Q8KsVOPAZu5WH4LnRezfNUPi7wB2YTTt28wDXRYxn5Jt5sRVkc?=
 =?us-ascii?Q?4M45YAlujpzNW2Ozsl6eAUWZolTn0xwKWJxaYoD6wEuPZfQnNIBylNXoQipD?=
 =?us-ascii?Q?+8PL79s33zPj/mRRk9y3QVTtmnRG4BxQAmgeFc994RP6kkm4MHS6LotJ81QK?=
 =?us-ascii?Q?XAjJyNI09NU+aqxiY+JuSux1GFKwL8AEwEf/g2PmoRa9ypcPWuZpEwv/hFgS?=
 =?us-ascii?Q?vg=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ae95d9de-be40-40ac-0ef3-08db2b2e91e9
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:42.1235
 (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: zElhepYmEOr4e4c+QR5vxytD617AZTsMbl3QjOG+lOvXW3P08aO2kbhulB1723ygDqMEWBhjkCHZLXf2JMgEyw==
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

Once commit 6d1ccff62780 ("net: reset mac header in dev_start_xmit()")
will be reverted, it will no longer be true that skb->data points at
skb_mac_header(skb) - since the skb->mac_header will not be set - so
stop saying that, and just say that it points to the MAC header.

I've reviewed vlan_insert_tag() and it does not *actually* depend on
skb_mac_header(), so reword that to avoid the confusion.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
 net/dsa/tag.h       | 2 +-
 net/dsa/tag_8021q.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/dsa/tag.h b/net/dsa/tag.h
index 7cfbca824f1c..32d12f4a9d73 100644
--- a/net/dsa/tag.h
+++ b/net/dsa/tag.h
@@ -229,7 +229,7 @@ static inline void *dsa_etype_header_pos_rx(struct sk_buff *skb)
 	return skb->data - 2;
 }
 
-/* On TX, skb->data points to skb_mac_header(skb), which means that EtherType
+/* On TX, skb->data points to the MAC header, which means that EtherType
  * header taggers start exactly where the EtherType is (the EtherType is
  * treated as part of the DSA header).
  */
diff --git a/net/dsa/tag_8021q.c b/net/dsa/tag_8021q.c
index 5ee9ef00954e..cbdfc392f7e0 100644
--- a/net/dsa/tag_8021q.c
+++ b/net/dsa/tag_8021q.c
@@ -461,8 +461,8 @@ EXPORT_SYMBOL_GPL(dsa_tag_8021q_unregister);
 struct sk_buff *dsa_8021q_xmit(struct sk_buff *skb, struct net_device *netdev,
 			       u16 tpid, u16 tci)
 {
-	/* skb->data points at skb_mac_header, which
-	 * is fine for vlan_insert_tag.
+	/* skb->data points at the MAC header, which is fine
+	 * for vlan_insert_tag().
 	 */
 	return vlan_insert_tag(skb, htons(tpid), tci);
 }
-- 
2.34.1