Skip to contentSkip to conversation

net: move comment in ndisc_router_discovery

PATCH Superseded Patrick Rohr 4 participants 6 messages Jul 25, 2023 – Jul 28, 2023

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: move comment in ndisc_router_discovery

Move setting the received flag comment to the appropriate section.

---
 net/ipv6/ndisc.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
net/ipv6/ndisc.c +4 -4
index eeb60888187f..0a29a4626194 100644
@@ -1266,10 +1266,6 @@ static enum skb_drop_reason ndisc_router_discovery(struct sk_buff *skb)
 	}
 #endif
 
-	/*
-	 *	set the RA_RECV flag in the interface
-	 */
-
 	in6_dev = __in6_dev_get(skb->dev);
 	if (!in6_dev) {
 		ND_PRINTK(0, err, "RA: can't find inet6 device for %s\n",
@@ -1297,6 +1293,10 @@ static enum skb_drop_reason ndisc_router_discovery(struct sk_buff *skb)
 	}
 #endif
 
+	/*
+	 *	set the RA_RECV flag in the interface
+	 */
+
 	if (in6_dev->if_flags & IF_RS_SENT) {
 		/*
 		 *	flag that an RA was received after an RS was sent
Signature · 1 line
2.41.0.487.g6d72f3e995-goog
maintainer
#1 lore raw
Quoted 23 lines · Patrick Rohr

Move setting the received flag comment to the appropriate section.

---
 net/ipv6/ndisc.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
net/ipv6/ndisc.c +0 -4
index eeb60888187f..0a29a4626194 100644
@@ -1266,10 +1266,6 @@ static enum skb_drop_reason ndisc_router_discovery(struct sk_buff *skb)
 	}
 #endif
 
-	/*
-	 *	set the RA_RECV flag in the interface
-	 */
-
 	in6_dev = __in6_dev_get(skb->dev);
 	if (!in6_dev) {
 		ND_PRINTK(0, err, "RA: can't find inet6 device for %s\n",

net/ipv6/ndisc.c static enum skb_drop_reason ndisc_router_discovery(struct sk_buff *skb) · line 1302

Quoted 10 lines
net/ipv6/ndisc.c +4 -0
@@ -1297,6 +1293,10 @@ static enum skb_drop_reason ndisc_router_discovery(struct sk_buff *skb)
 	}
 #endif
 
+	/*
+	 *	set the RA_RECV flag in the interface
+	 */
+
 	if (in6_dev->if_flags & IF_RS_SENT) {
 		/*
 		 *	flag that an RA was received after an RS was sent

There is already a comment here, so just delete the previous one.

#2 lore raw

PATCH v2 1/1 net: remove comment in ndisc_router_discovery

Removes superfluous (and misplaced) comment from ndisc_router_discovery.

---
 net/ipv6/ndisc.c | 4 ----
 1 file changed, 4 deletions(-)
net/ipv6/ndisc.c +0 -4
index eeb60888187f..c394799be38f 100644
@@ -1266,10 +1266,6 @@ static enum skb_drop_reason ndisc_router_discovery(struct sk_buff *skb)
 	}
 #endif
 
-	/*
-	 *	set the RA_RECV flag in the interface
-	 */
-
 	in6_dev = __in6_dev_get(skb->dev);
 	if (!in6_dev) {
 		ND_PRINTK(0, err, "RA: can't find inet6 device for %s\n",
Signature · 1 line
2.41.0.487.g6d72f3e995-goog
#5 lore raw

Re: [PATCH v2] net: remove comment in ndisc_router_discovery

In reply to Patrick Rohr
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:

Hello:

This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:

Quoted 6 lines · On Wed, 26 Jul 2023 11:47:42 -0700 you wrote:

Removes superfluous (and misplaced) comment from ndisc_router_discovery.

---
 net/ipv6/ndisc.c | 4 ----
 1 file changed, 4 deletions(-)

Here is the summary with links:
- [v2] net: remove comment in ndisc_router_discovery

    https://git.kernel.org/netdev/net-next/c/ef27ba5c845d

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html