]> git.itanic.dy.fi Git - linux-stable/commitdiff
nexthop: Do not increment dump sentinel at the end of the dump
authorIdo Schimmel <idosch@nvidia.com>
Sun, 13 Aug 2023 16:48:56 +0000 (19:48 +0300)
committerJakub Kicinski <kuba@kernel.org>
Wed, 16 Aug 2023 01:54:53 +0000 (18:54 -0700)
The nexthop and nexthop bucket dump callbacks previously returned a
positive return code even when the dump was complete, prompting the core
netlink code to invoke the callback again, until returning zero.

Zero was only returned by these callbacks when no information was filled
in the provided skb, which was achieved by incrementing the dump
sentinel at the end of the dump beyond the ID of the last nexthop.

This is no longer necessary as when the dump is complete these callbacks
return zero.

Remove the unnecessary increment.

Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Reviewed-by: Petr Machata <petrm@nvidia.com>
Reviewed-by: David Ahern <dsahern@kernel.org>
Link: https://lore.kernel.org/r/20230813164856.2379822-3-idosch@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/ipv4/nexthop.c

index 7e8bb85e9dcbeec12f9c1723052999fcf94cf244..bbff68b5b5d4a1d835c9785fbe84f4cab32a1db0 100644 (file)
@@ -3209,7 +3209,6 @@ static int rtm_dump_walk_nexthops(struct sk_buff *skb,
                        return err;
        }
 
-       ctx->idx++;
        return 0;
 }