diff options
| author | Jakub Kicinski <jakub.kicinski@netronome.com> | 2019-01-14 10:52:45 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-01-16 14:06:34 -0800 |
| commit | a5a82d841186d13c4a6d500dfcf7d02b4195e3ff (patch) | |
| tree | 2fca4e777d08ac1e2e40f8c588c013ab37af665e | |
| parent | 91fa038d9446b5bf5ea80822790af7dd9bcbb5a2 (diff) | |
| download | linux-a5a82d841186d13c4a6d500dfcf7d02b4195e3ff.tar.gz linux-a5a82d841186d13c4a6d500dfcf7d02b4195e3ff.tar.bz2 linux-a5a82d841186d13c4a6d500dfcf7d02b4195e3ff.zip | |
ipv6: route: place a warning with duplicated string with correct extack
"IPv6: " prefix is already added by pr_fmt, no need to include
it again in the pr_warn() format. The message predates extack
support, we can replace the whole thing with an extack message.
Suggested-by: David Ahern <dsahern@gmail.com>
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ipv6/route.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 40b225f87d5e..964491cf3672 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -4251,17 +4251,6 @@ struct rt6_nh { struct list_head next; }; -static void ip6_print_replace_route_err(struct list_head *rt6_nh_list) -{ - struct rt6_nh *nh; - - list_for_each_entry(nh, rt6_nh_list, next) { - pr_warn("IPV6: multipath route replace failed (check consistency of installed routes): %pI6c nexthop %pI6c ifi %d\n", - &nh->r_cfg.fc_dst, &nh->r_cfg.fc_gateway, - nh->r_cfg.fc_ifindex); - } -} - static int ip6_route_info_append(struct net *net, struct list_head *rt6_nh_list, struct fib6_info *rt, @@ -4407,7 +4396,8 @@ static int ip6_route_multipath_add(struct fib6_config *cfg, nh->fib6_info = NULL; if (err) { if (replace && nhn) - ip6_print_replace_route_err(&rt6_nh_list); + NL_SET_ERR_MSG_MOD(extack, + "multipath route replace failed (check consistency of installed routes)"); err_nh = nh; goto add_errout; } |