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 8/9] net: dsa: update TX path comments to not mention skb_mac_header()
Date:   Fri, 21 Apr 2023 01:56:00 +0300
Message-Id: <20230420225601.2358327-9-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?SZTZSWwyDdAkjVCi9/xU31IjVLRLChxWyzehlkAu+GKBlIL/7FnVhNxlnsjc?=
 =?us-ascii?Q?IRCKi13naCbvyeLpv5YLCn7LVnwfRuK4YtdYXTBMyw+sY+xuOzXuAeqS//rJ?=
 =?us-ascii?Q?OVyILsyGjCcmftLuFZH94Q8qWqIQ9xwH2ceXWoQ6RZ8d0UIumw/sxtVmD48M?=
 =?us-ascii?Q?dVpX1xU4kPpex5uPGz1sTvNrDZDDKESJQb/daN2+FG2TaNM3kjBehBkdPur5?=
 =?us-ascii?Q?MojuvY8U4Dvagx1mhJIxSKpAh2dOHOAVxqqLObltuqOPHQ4hDVL6fgvMgP47?=
 =?us-ascii?Q?hYpHSAJgbldRPBKdY65yE8RF4EOu2YALBHYfZtKOk+1OkTgdCTJ3WaLhNzG2?=
 =?us-ascii?Q?ZViyxbZ9bvNNvC0x40XU3isjyhduFQR6SyCD07yJJ5BuleIqtTepLIp3wGW1?=
 =?us-ascii?Q?sCynww4JbfUDerAocvwvGVtnIha84zpGTTXB3FzGuZCqM7yQ5oOT5LCxsH5a?=
 =?us-ascii?Q?Lx205kOBh8Zc+BHotJJ9L9EEuCYayJCKMpXdsiayS+GF/Q2+ZOF0S/6Cqagw?=
 =?us-ascii?Q?bdlE1luJ3F6ZNS4OpryzR3PTjQ0gnSsa2SVVVkHK2ZGgeOsd59bMRIxA2thy?=
 =?us-ascii?Q?q5xDDGowF+zh6TKBB5v5MFzGum4VW3h3XKblebb1GXfVtpSV7tmO+BsomC/t?=
 =?us-ascii?Q?vEr97nmi7ApKla0OXLqhRl0kiOkOkQGCPP61vFQAPzIAVS+IQeBoExyYwIt4?=
 =?us-ascii?Q?nxJhkRTGEbKOjDiD5KR2otHCQAtaLZlMN/2fKctAPnvIheLu4qNStRwFO1QV?=
 =?us-ascii?Q?w2jp8eIKi9oXKBOKlzRVB8kXgn8VeRV5KIR4pRKSdca6DE3UxnhiXgkR9Xis?=
 =?us-ascii?Q?P4NNHfBe1aEt0TSBVIeKgMHWn9BO3CqW5g9tnOks9+aMzvD6o7So9ge8tBI1?=
 =?us-ascii?Q?4x6oPUvOxVayo47r3m5Dwc7voRi026bCHwNfSI5ENUJmvsu+iutMa26doDjW?=
 =?us-ascii?Q?LjT57ExA+gyilKL+YbG0ETapf30iXyduLZqz6hiXfkzWPGGjDsjvbVanRH15?=
 =?us-ascii?Q?vENbLSRmdlLJJfEsHxzlcNA8Q7DLdBMej0A7U/bPx+p4rfDLmJIe7ceLsGZV?=
 =?us-ascii?Q?h6/UgoEY72Rk/VIcNJWKn0nbFf2i09dpSDybzUOnqrFWEJyF16FOrvnlenPc?=
 =?us-ascii?Q?kgm8LlRyNUZpd4SH76dLu6XqxDXnFJRDlB6ZeJp6EosLby1St2LX7LjXA1Vx?=
 =?us-ascii?Q?TySsmrXVGuWe77nRwpB2y1SzrVm1UpcbD6z/uhS6M7YgRskboguLkGbsZSH9?=
 =?us-ascii?Q?+gjGdmdbot4NVCeWRhsecSeTtreYDlZAVjV3rYjA/K/g8+KiBKWu8V5hm31J?=
 =?us-ascii?Q?oQyS+uOvXFRNiiZl1V0p9GtqL6ZOTjvYPWugaGT/8MfNS4/G+y/wgSpQfw50?=
 =?us-ascii?Q?5fOTYV9nM8/fGUjPsWzEKDfOuG7o2/1f+GEQlFBgfDtmisWrwdE+q75C3fJ+?=
 =?us-ascii?Q?Pp6n4PTkkGbwhRllw+sF8R9RDM1FQHqMQ+T4pRkZazw2j8ORc1v1Y9rrW3C5?=
 =?us-ascii?Q?DQpjzgio8Cm8aksb8IuDXM2+KF6mXG/KByrFcbJmgsoWijty/bOuNZr9BB7t?=
 =?us-ascii?Q?r6KBeDvcsIs/CE0kx96rpLB7haciyK74TDtH64fMhNlPrR8k0UxzOAD6VMMg?=
 =?us-ascii?Q?HQ=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 5d84bc5a-434e-40ec-64ef-08db41f27394
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:18.1496
 (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: nDD3ILeRjeJydKjQLfnLTTyf2yKXlYzIo4L+pCDjzRbvPD08JM7WEm3GQYAZ3zbuTW0oC1gmwgCHM+o08Bcrmg==
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

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