From: Kuniyuki Iwashima Date: Fri, 18 Apr 2025 00:03:50 +0000 (-0700) Subject: ipv6: Don't pass net to ip6_route_info_append(). X-Git-Tag: v6.16-rc1~132^2~227^2~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=87d5d921eaf225fc820907f3c6827e5d7cc85bc3;p=thirdparty%2Flinux.git ipv6: Don't pass net to ip6_route_info_append(). net is not used in ip6_route_info_append() after commit 36f19d5b4f99 ("net/ipv6: Remove extra call to ip6_convert_metrics for multipath case"). Let's remove the argument. Signed-off-by: Kuniyuki Iwashima Acked-by: Paolo Abeni Link: https://patch.msgid.link/20250418000443.43734-10-kuniyu@amazon.com Signed-off-by: Paolo Abeni --- diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 3037d13043882..a687eec1eab00 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -5318,8 +5318,7 @@ struct rt6_nh { struct list_head next; }; -static int ip6_route_info_append(struct net *net, - struct list_head *rt6_nh_list, +static int ip6_route_info_append(struct list_head *rt6_nh_list, struct fib6_info *rt, struct fib6_config *r_cfg) { @@ -5459,8 +5458,7 @@ static int ip6_route_multipath_add(struct fib6_config *cfg, rt->fib6_nh->fib_nh_weight = rtnh->rtnh_hops + 1; - err = ip6_route_info_append(info->nl_net, &rt6_nh_list, - rt, &r_cfg); + err = ip6_route_info_append(&rt6_nh_list, rt, &r_cfg); if (err) { fib6_info_release(rt); goto cleanup;