[iproute2/net-next] devlink: use DEVLINK_CMD_ESWITCH_* instead of DEVLINK_CMD_ESWITCH_MODE_*

From: Jiri Pirko <jiri@mellanox.com>

Sync with kernel and don't use the obsolete enum values.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
---
 devlink/devlink.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

On Sun, 19 Feb 2017 15:37:06 +0100
Jiri Pirko <jiri@resnulli.us> wrote:

> From: Jiri Pirko <jiri@mellanox.com>
> 
> Sync with kernel and don't use the obsolete enum values.
> 
> Signed-off-by: Jiri Pirko <jiri@mellanox.com>
> ---
>  devlink/devlink.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/devlink/devlink.c b/devlink/devlink.c
> index 34a409f..c357580 100644
> --- a/devlink/devlink.c
> +++ b/devlink/devlink.c
> @@ -1303,7 +1303,7 @@ static int cmd_dev_eswitch_show(struct dl *dl)
>  	struct nlmsghdr *nlh;
>  	int err;
>  
> -	nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_ESWITCH_MODE_GET,
> +	nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_ESWITCH_GET,
>  			       NLM_F_REQUEST | NLM_F_ACK);
>  
>  	err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLE, 0);
> @@ -1321,7 +1321,7 @@ static int cmd_dev_eswitch_set(struct dl *dl)
>  	struct nlmsghdr *nlh;
>  	int err;
>  
> -	nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_ESWITCH_MODE_SET,
> +	nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_ESWITCH_SET,
>  			       NLM_F_REQUEST | NLM_F_ACK);
>  
>  	err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLE,

I think you need go go back and reconsider the ABI change.
This patch would cause the net-next version of iproute2 devlink to not
work with older kernels.

The iproute2 toolset relies on the kernel ABI guarantees so that later
versions of iproute2 still interoperate with older kernels. It is possible
that new features get added but the old functionality will always work.

On Sun, 19 Feb 2017 15:37:06 +0100
Jiri Pirko <jiri@resnulli.us> wrote:

> From: Jiri Pirko <jiri@mellanox.com>
> 
> Sync with kernel and don't use the obsolete enum values.
> 
> Signed-off-by: Jiri Pirko <jiri@mellanox.com>
> ---
>  devlink/devlink.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/devlink/devlink.c b/devlink/devlink.c
> index 34a409f..c357580 100644
> --- a/devlink/devlink.c
> +++ b/devlink/devlink.c
> @@ -1303,7 +1303,7 @@ static int cmd_dev_eswitch_show(struct dl *dl)
>  	struct nlmsghdr *nlh;
>  	int err;
>  
> -	nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_ESWITCH_MODE_GET,
> +	nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_ESWITCH_GET,
>  			       NLM_F_REQUEST | NLM_F_ACK);
>  
>  	err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLE, 0);
> @@ -1321,7 +1321,7 @@ static int cmd_dev_eswitch_set(struct dl *dl)
>  	struct nlmsghdr *nlh;
>  	int err;
>  
> -	nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_ESWITCH_MODE_SET,
> +	nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_ESWITCH_SET,
>  			       NLM_F_REQUEST | NLM_F_ACK);
>  
>  	err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLE,

I went back and looked at the original commit.
    devlink: fix the name of eswitch commands
OK, so you only changed the name, not the value so it would be binary
compatible.

Applied.

Sun, Feb 19, 2017 at 09:01:15PM CET, stephen@networkplumber.org wrote:
>On Sun, 19 Feb 2017 15:37:06 +0100
>Jiri Pirko <jiri@resnulli.us> wrote:
>
>> From: Jiri Pirko <jiri@mellanox.com>
>> 
>> Sync with kernel and don't use the obsolete enum values.
>> 
>> Signed-off-by: Jiri Pirko <jiri@mellanox.com>
>> ---
>>  devlink/devlink.c | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>> 
>> diff --git a/devlink/devlink.c b/devlink/devlink.c
>> index 34a409f..c357580 100644
>> --- a/devlink/devlink.c
>> +++ b/devlink/devlink.c
>> @@ -1303,7 +1303,7 @@ static int cmd_dev_eswitch_show(struct dl *dl)
>>  	struct nlmsghdr *nlh;
>>  	int err;
>>  
>> -	nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_ESWITCH_MODE_GET,
>> +	nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_ESWITCH_GET,
>>  			       NLM_F_REQUEST | NLM_F_ACK);
>>  
>>  	err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLE, 0);
>> @@ -1321,7 +1321,7 @@ static int cmd_dev_eswitch_set(struct dl *dl)
>>  	struct nlmsghdr *nlh;
>>  	int err;
>>  
>> -	nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_ESWITCH_MODE_SET,
>> +	nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_ESWITCH_SET,
>>  			       NLM_F_REQUEST | NLM_F_ACK);
>>  
>>  	err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLE,
>
>I went back and looked at the original commit.
>    devlink: fix the name of eswitch commands
>OK, so you only changed the name, not the value so it would be binary
>compatible.

Yep.

>
>Applied.

Thanks.