From: Jiri Pirko Date: Sat, 28 Mar 2020 18:25:29 +0000 (+0100) Subject: net: devlink: use NL_SET_ERR_MSG_MOD instead of NL_SET_ERR_MSG X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=054eae82537efb9f111b5ebc2db001d7ef07dc2e;p=linux.git net: devlink: use NL_SET_ERR_MSG_MOD instead of NL_SET_ERR_MSG The rest of the devlink code sets the extack message using NL_SET_ERR_MSG_MOD. Change the existing appearances of NL_SET_ERR_MSG to NL_SET_ERR_MSG_MOD. Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller --- diff --git a/net/core/devlink.c b/net/core/devlink.c index d20efdc8cc734..5b968d2040a57 100644 --- a/net/core/devlink.c +++ b/net/core/devlink.c @@ -2709,7 +2709,7 @@ static struct net *devlink_netns_get(struct sk_buff *skb, struct net *net; if (!!netns_pid_attr + !!netns_fd_attr + !!netns_id_attr > 1) { - NL_SET_ERR_MSG(info->extack, "multiple netns identifying attributes specified"); + NL_SET_ERR_MSG_MOD(info->extack, "multiple netns identifying attributes specified"); return ERR_PTR(-EINVAL); } @@ -2727,7 +2727,7 @@ static struct net *devlink_netns_get(struct sk_buff *skb, net = ERR_PTR(-EINVAL); } if (IS_ERR(net)) { - NL_SET_ERR_MSG(info->extack, "Unknown network namespace"); + NL_SET_ERR_MSG_MOD(info->extack, "Unknown network namespace"); return ERR_PTR(-EINVAL); } if (!netlink_ns_capable(skb, net->user_ns, CAP_NET_ADMIN)) {