| Message ID | 20240311162307.545385-3-idosch@nvidia.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 262a68aa46f88d9b42f1569f893d53f71ddf7e52 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | nexthop: Fix two nexthop group statistics issues | expand |
On 3/11/24 10:23 AM, Ido Schimmel wrote: > The attribute is parsed in __nh_valid_dump_req() which is called by the > dump handlers of RTM_GETNEXTHOP and RTM_GETNEXTHOPBUCKET although it is > only used by the former and rejected by the policy of the latter. > > Move the parsing to nh_valid_dump_req() which is only called by the dump > handler of RTM_GETNEXTHOP. > > This is a preparation for a subsequent patch. > > Signed-off-by: Ido Schimmel <idosch@nvidia.com> > --- > > Notes: > v2: > * New patch > > net/ipv4/nexthop.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > Reviewed-by: David Ahern <dsahern@kernel.org>
diff --git a/net/ipv4/nexthop.c b/net/ipv4/nexthop.c index 03bacf9c0502..573da3660cb3 100644 --- a/net/ipv4/nexthop.c +++ b/net/ipv4/nexthop.c @@ -3397,11 +3397,6 @@ static int __nh_valid_dump_req(const struct nlmsghdr *nlh, struct nlattr **tb, return -EINVAL; } - if (tb[NHA_OP_FLAGS]) - filter->op_flags = nla_get_u32(tb[NHA_OP_FLAGS]); - else - filter->op_flags = 0; - return 0; } @@ -3417,6 +3412,11 @@ static int nh_valid_dump_req(const struct nlmsghdr *nlh, if (err < 0) return err; + if (tb[NHA_OP_FLAGS]) + filter->op_flags = nla_get_u32(tb[NHA_OP_FLAGS]); + else + filter->op_flags = 0; + return __nh_valid_dump_req(nlh, tb, filter, cb->extack); }
The attribute is parsed in __nh_valid_dump_req() which is called by the dump handlers of RTM_GETNEXTHOP and RTM_GETNEXTHOPBUCKET although it is only used by the former and rejected by the policy of the latter. Move the parsing to nh_valid_dump_req() which is only called by the dump handler of RTM_GETNEXTHOP. This is a preparation for a subsequent patch. Signed-off-by: Ido Schimmel <idosch@nvidia.com> --- Notes: v2: * New patch net/ipv4/nexthop.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)