| Message ID | 20230725185151.37310-1-prohr@google.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: move comment in ndisc_router_discovery | expand |
On 7/25/23 12:51 PM, Patrick Rohr wrote: > Move setting the received flag comment to the appropriate section. > > Signed-off-by: Patrick Rohr <prohr@google.com> > --- > net/ipv6/ndisc.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c > index eeb60888187f..0a29a4626194 100644 > --- a/net/ipv6/ndisc.c > +++ b/net/ipv6/ndisc.c > @@ -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 There is already a comment here, so just delete the previous one.
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index eeb60888187f..0a29a4626194 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c @@ -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
Move setting the received flag comment to the appropriate section. Signed-off-by: Patrick Rohr <prohr@google.com> --- net/ipv6/ndisc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)