Commit 054eae82 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

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: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6e2345c1

net/core/devlink.c

+2 −2
Original line number Diff line number Diff line
@@ -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)) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE