Re: [PATCH mptcp-next v12 03/15] mptcp: add token for get-addr in yaml

[Mat Martineau <martineau@kernel.org>]

On Wed, 14 Feb 2024, Geliang Tang wrote:

> From: Geliang Tang <tanggeliang@kylinos.cn>
>
> This patch adds token paramenter together with addr in get-addr section in

Hi Geliang -

The CI shows a checkpatch warning for the misspelled "parameter" above.

Thanks,

Mat

> mptcp_pm.yaml, then use the following commands to update mptcp_pm_gen.c
> and mptcp_pm_gen.h:
>
> ./tools/net/ynl/ynl-gen-c.py --mode kernel \
>        --spec Documentation/netlink/specs/mptcp_pm.yaml --source \
>        -o net/mptcp/mptcp_pm_gen.c
> ./tools/net/ynl/ynl-gen-c.py --mode kernel \
>        --spec Documentation/netlink/specs/mptcp_pm.yaml --header \
>        -o net/mptcp/mptcp_pm_gen.h
>
> Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
> ---
> Documentation/netlink/specs/mptcp_pm.yaml | 3 ++-
> net/mptcp/mptcp_pm_gen.c                  | 7 ++++---
> net/mptcp/mptcp_pm_gen.h                  | 2 +-
> 3 files changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/Documentation/netlink/specs/mptcp_pm.yaml b/Documentation/netlink/specs/mptcp_pm.yaml
> index 49f90cfb4698..af525ed29792 100644
> --- a/Documentation/netlink/specs/mptcp_pm.yaml
> +++ b/Documentation/netlink/specs/mptcp_pm.yaml
> @@ -292,13 +292,14 @@ operations:
>     -
>       name: get-addr
>       doc: Get endpoint information
> -      attribute-set: endpoint
> +      attribute-set: attr
>       dont-validate: [ strict ]
>       flags: [ uns-admin-perm ]
>       do: &get-addr-attrs
>         request:
>           attributes:
>            - addr
> +           - token
>         reply:
>           attributes:
>            - addr
> diff --git a/net/mptcp/mptcp_pm_gen.c b/net/mptcp/mptcp_pm_gen.c
> index 670da7822e6c..c30a2a90a192 100644
> --- a/net/mptcp/mptcp_pm_gen.c
> +++ b/net/mptcp/mptcp_pm_gen.c
> @@ -32,8 +32,9 @@ const struct nla_policy mptcp_pm_del_addr_nl_policy[MPTCP_PM_ENDPOINT_ADDR + 1]
> };
>
> /* MPTCP_PM_CMD_GET_ADDR - do */
> -const struct nla_policy mptcp_pm_get_addr_nl_policy[MPTCP_PM_ENDPOINT_ADDR + 1] = {
> -	[MPTCP_PM_ENDPOINT_ADDR] = NLA_POLICY_NESTED(mptcp_pm_address_nl_policy),
> +const struct nla_policy mptcp_pm_get_addr_nl_policy[MPTCP_PM_ATTR_TOKEN + 1] = {
> +	[MPTCP_PM_ATTR_ADDR] = NLA_POLICY_NESTED(mptcp_pm_address_nl_policy),
> +	[MPTCP_PM_ATTR_TOKEN] = { .type = NLA_U32, },
> };
>
> /* MPTCP_PM_CMD_FLUSH_ADDRS - do */
> @@ -110,7 +111,7 @@ const struct genl_ops mptcp_pm_nl_ops[11] = {
> 		.doit		= mptcp_pm_nl_get_addr_doit,
> 		.dumpit		= mptcp_pm_nl_get_addr_dumpit,
> 		.policy		= mptcp_pm_get_addr_nl_policy,
> -		.maxattr	= MPTCP_PM_ENDPOINT_ADDR,
> +		.maxattr	= MPTCP_PM_ATTR_TOKEN,
> 		.flags		= GENL_UNS_ADMIN_PERM,
> 	},
> 	{
> diff --git a/net/mptcp/mptcp_pm_gen.h b/net/mptcp/mptcp_pm_gen.h
> index ac9fc7225b6a..e24258f6f819 100644
> --- a/net/mptcp/mptcp_pm_gen.h
> +++ b/net/mptcp/mptcp_pm_gen.h
> @@ -18,7 +18,7 @@ extern const struct nla_policy mptcp_pm_add_addr_nl_policy[MPTCP_PM_ENDPOINT_ADD
>
> extern const struct nla_policy mptcp_pm_del_addr_nl_policy[MPTCP_PM_ENDPOINT_ADDR + 1];
>
> -extern const struct nla_policy mptcp_pm_get_addr_nl_policy[MPTCP_PM_ENDPOINT_ADDR + 1];
> +extern const struct nla_policy mptcp_pm_get_addr_nl_policy[MPTCP_PM_ATTR_TOKEN + 1];
>
> extern const struct nla_policy mptcp_pm_flush_addrs_nl_policy[MPTCP_PM_ENDPOINT_ADDR + 1];
>
> -- 
> 2.40.1
>
>
>