Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

devlink: fix the name of eswitch commands 



The eswitch_[gs]et command is supposed to be similar to port_[gs]et
command - for multiple eswitch attributes. However, when it was introduced
by 08f4b591 ("net/devlink: Add E-Switch mode control") it was wrongly
named with the word "mode" in it. So fix this now, make the oririnal
enum value existing but obsolete.

Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0d2164af

include/uapi/linux/devlink.h

+8 −2
Original line number Diff line number Diff line
@@ -57,8 +57,14 @@ enum devlink_command { 
	DEVLINK_CMD_SB_OCC_SNAPSHOT,

	DEVLINK_CMD_SB_OCC_MAX_CLEAR,



	DEVLINK_CMD_ESWITCH_MODE_GET,

	DEVLINK_CMD_ESWITCH_MODE_SET,

	DEVLINK_CMD_ESWITCH_GET,

#define DEVLINK_CMD_ESWITCH_MODE_GET /* obsolete, never use this! */ \

	DEVLINK_CMD_ESWITCH_GET



	DEVLINK_CMD_ESWITCH_SET,

#define DEVLINK_CMD_ESWITCH_MODE_SET /* obsolete, never use this! */ \

	DEVLINK_CMD_ESWITCH_SET



	/* add new commands above here */



	__DEVLINK_CMD_MAX,

net/core/devlink.c

+9 −9
Original line number Diff line number Diff line
@@ -1435,7 +1435,7 @@ static int devlink_eswitch_fill(struct sk_buff *msg, struct devlink *devlink, 
	return err;

}



static int devlink_nl_cmd_eswitch_mode_get_doit(struct sk_buff *skb,

static int devlink_nl_cmd_eswitch_get_doit(struct sk_buff *skb,

					   struct genl_info *info)

{

	struct devlink *devlink = info->user_ptr[0];
@@ -1450,7 +1450,7 @@ static int devlink_nl_cmd_eswitch_mode_get_doit(struct sk_buff *skb, 
	if (!msg)

		return -ENOMEM;



	err = devlink_eswitch_fill(msg, devlink, DEVLINK_CMD_ESWITCH_MODE_GET,

	err = devlink_eswitch_fill(msg, devlink, DEVLINK_CMD_ESWITCH_GET,

				   info->snd_portid, info->snd_seq, 0);



	if (err) {
@@ -1461,7 +1461,7 @@ static int devlink_nl_cmd_eswitch_mode_get_doit(struct sk_buff *skb, 
	return genlmsg_reply(msg, info);

}



static int devlink_nl_cmd_eswitch_mode_set_doit(struct sk_buff *skb,

static int devlink_nl_cmd_eswitch_set_doit(struct sk_buff *skb,

					   struct genl_info *info)

{

	struct devlink *devlink = info->user_ptr[0];
@@ -1629,15 +1629,15 @@ static const struct genl_ops devlink_nl_ops[] = { 
				  DEVLINK_NL_FLAG_LOCK_PORTS,

	},

	{

		.cmd = DEVLINK_CMD_ESWITCH_MODE_GET,

		.doit = devlink_nl_cmd_eswitch_mode_get_doit,

		.cmd = DEVLINK_CMD_ESWITCH_GET,

		.doit = devlink_nl_cmd_eswitch_get_doit,

		.policy = devlink_nl_policy,

		.flags = GENL_ADMIN_PERM,

		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,

	},

	{

		.cmd = DEVLINK_CMD_ESWITCH_MODE_SET,

		.doit = devlink_nl_cmd_eswitch_mode_set_doit,

		.cmd = DEVLINK_CMD_ESWITCH_SET,

		.doit = devlink_nl_cmd_eswitch_set_doit,

		.policy = devlink_nl_policy,

		.flags = GENL_ADMIN_PERM,

		.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,