diff options
| author |   David Ahern <dsahern@gmail.com> | 2018-09-26 17:35:14 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-09-26 19:57:23 -0700 |
| commit | 36f19d5b4f99fa9fa8263877e5f8e669d7fddc14 (patch) | |
| tree | 733d02e8cf2f90e0abf4241f7c33ad8491bbdfe1 /net/ipv6 | |
| parent | tipc: lock wakeup & inputq at tipc_link_reset() (diff) | |
| download | linux-dev-36f19d5b4f99fa9fa8263877e5f8e669d7fddc14.tar.xz linux-dev-36f19d5b4f99fa9fa8263877e5f8e669d7fddc14.zip | |
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: d4ead6b34b67f ("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>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/route.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 826b14de7dbb..a366c05a239d 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -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); |