diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2023-08-15 18:54:54 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-08-15 18:54:55 -0700 |
| commit | b31f7a8b3a07c306fe568d3801c4161e0932712d (patch) | |
| tree | 2527f1eee6b271107a29670991051727d018b1e7 | |
| parent | 1e02d75817172c8ca32f6c6bdf389ab4efd76305 (diff) | |
| parent | db1428f66a8c97793e6596e7c62047211dd6db79 (diff) | |
| download | nf-next-b31f7a8b3a07c306fe568d3801c4161e0932712d.tar.gz | |
Merge branch 'nexthop-various-cleanups'
Ido Schimmel says:
====================
nexthop: Various cleanups
Benefit from recent bug fixes and simplify the nexthop dump code.
No regressions in existing tests:
# ./fib_nexthops.sh
[...]
Tests passed: 234
Tests failed: 0
====================
Link: https://lore.kernel.org/r/20230813164856.2379822-1-idosch@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
| -rw-r--r-- | net/ipv4/nexthop.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/net/ipv4/nexthop.c b/net/ipv4/nexthop.c index 09d36bcbd7d4af..bbff68b5b5d4a1 100644 --- a/net/ipv4/nexthop.c +++ b/net/ipv4/nexthop.c @@ -3209,7 +3209,6 @@ static int rtm_dump_walk_nexthops(struct sk_buff *skb, return err; } - ctx->idx++; return 0; } @@ -3337,7 +3336,6 @@ static int nh_valid_dump_bucket_req(const struct nlmsghdr *nlh, struct rtm_dump_res_bucket_ctx { struct rtm_dump_nh_ctx nh; u16 bucket_index; - u32 done_nh_idx; /* 1 + the index of the last fully processed NH. */ }; static struct rtm_dump_res_bucket_ctx * @@ -3366,9 +3364,6 @@ static int rtm_dump_nexthop_bucket_nh(struct sk_buff *skb, u16 bucket_index; int err; - if (dd->ctx->nh.idx < dd->ctx->done_nh_idx) - return 0; - nhg = rtnl_dereference(nh->nh_grp); res_table = rtnl_dereference(nhg->res_table); for (bucket_index = dd->ctx->bucket_index; @@ -3395,7 +3390,6 @@ static int rtm_dump_nexthop_bucket_nh(struct sk_buff *skb, return err; } - dd->ctx->done_nh_idx = dd->ctx->nh.idx + 1; dd->ctx->bucket_index = 0; return 0; |