Commit 36f19d5b authored Sep 26, 2018 by David Ahern Committed by David S. Miller Sep 26, 2018

net/ipv6: Remove extra call to ip6_convert_metrics for multipath case



The change to move metrics from the dst to rt6_info moved the call
to ip6_convert_metrics from ip6_route_add to ip6_route_info_create. In
doing so it makes the call in ip6_route_info_append redundant and
actually leaks the metrics installed as part of the ip6_route_info_create.
Remove the now unnecessary call.

Fixes: d4ead6b3 ("net/ipv6: move metrics from dst to rt6_info")
Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 3f32d0be

net/ipv6/route.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -4321,11 +4321,6 @@ static int ip6_route_info_append(struct net *net,
		if (!nh)
		return -ENOMEM;
		nh->fib6_info = rt;
		err = ip6_convert_metrics(net, rt, r_cfg);
		if (err) {
		kfree(nh);
		return err;
		}
		memcpy(&nh->r_cfg, r_cfg, sizeof(*r_cfg));
		list_add_tail(&nh->next, rt6_nh_list);

Admin message