Commit a5a82d84 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

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: default avatarDavid Ahern <>
Signed-off-by: default avatarJakub Kicinski <>
Reviewed-by: default avatarDavid Ahern <>
Signed-off-by: default avatarDavid S. Miller <>
parent 91fa038d
...@@ -4251,17 +4251,6 @@ struct rt6_nh { ...@@ -4251,17 +4251,6 @@ struct rt6_nh {
struct list_head next; 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,
static int ip6_route_info_append(struct net *net, static int ip6_route_info_append(struct net *net,
struct list_head *rt6_nh_list, struct list_head *rt6_nh_list,
struct fib6_info *rt, struct fib6_info *rt,
...@@ -4407,7 +4396,8 @@ static int ip6_route_multipath_add(struct fib6_config *cfg, ...@@ -4407,7 +4396,8 @@ static int ip6_route_multipath_add(struct fib6_config *cfg,
nh->fib6_info = NULL; nh->fib6_info = NULL;
if (err) { if (err) {
if (replace && nhn) 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; err_nh = nh;
goto add_errout; goto add_errout;
} }
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment