From: Stefan Schmidt <stefan@osg.samsung.com>
To: Alexander Aring <aar@pengutronix.de>, linux-wpan@vger.kernel.org
Cc: kernel@pengutronix.de
Subject: Re: [PATCH wpan-tools 1/2] nl802154: update nl802154.h
Date: Wed, 11 May 2016 17:07:57 +0200 [thread overview]
Message-ID: <57334ACD.3040708@osg.samsung.com> (raw)
In-Reply-To: <1462959979-6755-1-git-send-email-aar@pengutronix.de>
Hello.
On 11/05/16 11:46, Alexander Aring wrote:
> Signed-off-by: Alexander Aring <aar@pengutronix.de>
You could have explained here that this update brings the defines needed
for netns and later on llsec support.
But after all its only a sync of the header file from kernel to
userspace utility.
> ---
> src/nl802154.h | 202 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 202 insertions(+)
>
> diff --git a/src/nl802154.h b/src/nl802154.h
> index cf2713d..ddcee12 100644
> --- a/src/nl802154.h
> +++ b/src/nl802154.h
> @@ -54,8 +54,26 @@ enum nl802154_commands {
>
> NL802154_CMD_SET_ACKREQ_DEFAULT,
>
> + NL802154_CMD_SET_WPAN_PHY_NETNS,
> +
> /* add new commands above here */
>
> +#ifdef CONFIG_IEEE802154_NL802154_EXPERIMENTAL
> + NL802154_CMD_SET_SEC_PARAMS,
> + NL802154_CMD_GET_SEC_KEY, /* can dump */
> + NL802154_CMD_NEW_SEC_KEY,
> + NL802154_CMD_DEL_SEC_KEY,
> + NL802154_CMD_GET_SEC_DEV, /* can dump */
> + NL802154_CMD_NEW_SEC_DEV,
> + NL802154_CMD_DEL_SEC_DEV,
> + NL802154_CMD_GET_SEC_DEVKEY, /* can dump */
> + NL802154_CMD_NEW_SEC_DEVKEY,
> + NL802154_CMD_DEL_SEC_DEVKEY,
> + NL802154_CMD_GET_SEC_LEVEL, /* can dump */
> + NL802154_CMD_NEW_SEC_LEVEL,
> + NL802154_CMD_DEL_SEC_LEVEL,
> +#endif /* CONFIG_IEEE802154_NL802154_EXPERIMENTAL */
> +
> /* used to define NL802154_CMD_MAX below */
> __NL802154_CMD_AFTER_LAST,
> NL802154_CMD_MAX = __NL802154_CMD_AFTER_LAST - 1
> @@ -108,8 +126,25 @@ enum nl802154_attrs {
>
> NL802154_ATTR_ACKREQ_DEFAULT,
>
> + NL802154_ATTR_PAD,
> +
> + NL802154_ATTR_PID,
> + NL802154_ATTR_NETNS_FD,
> +
> /* add attributes here, update the policy in nl802154.c */
>
> +#ifdef CONFIG_IEEE802154_NL802154_EXPERIMENTAL
> + NL802154_ATTR_SEC_ENABLED,
> + NL802154_ATTR_SEC_OUT_LEVEL,
> + NL802154_ATTR_SEC_OUT_KEY_ID,
> + NL802154_ATTR_SEC_FRAME_COUNTER,
> +
> + NL802154_ATTR_SEC_LEVEL,
> + NL802154_ATTR_SEC_DEVICE,
> + NL802154_ATTR_SEC_DEVKEY,
> + NL802154_ATTR_SEC_KEY,
> +#endif /* CONFIG_IEEE802154_NL802154_EXPERIMENTAL */
> +
> __NL802154_ATTR_AFTER_LAST,
> NL802154_ATTR_MAX = __NL802154_ATTR_AFTER_LAST - 1
> };
> @@ -247,4 +282,171 @@ enum nl802154_supported_bool_states {
> NL802154_SUPPORTED_BOOL_MAX = __NL802154_SUPPORTED_BOOL_AFTER_LAST - 1
> };
>
> +#ifdef CONFIG_IEEE802154_NL802154_EXPERIMENTAL
> +
> +enum nl802154_dev_addr_modes {
> + NL802154_DEV_ADDR_NONE,
> + __NL802154_DEV_ADDR_INVALID,
> + NL802154_DEV_ADDR_SHORT,
> + NL802154_DEV_ADDR_EXTENDED,
> +
> + /* keep last */
> + __NL802154_DEV_ADDR_AFTER_LAST,
> + NL802154_DEV_ADDR_MAX = __NL802154_DEV_ADDR_AFTER_LAST - 1
> +};
> +
> +enum nl802154_dev_addr_attrs {
> + NL802154_DEV_ADDR_ATTR_UNSPEC,
> +
> + NL802154_DEV_ADDR_ATTR_PAN_ID,
> + NL802154_DEV_ADDR_ATTR_MODE,
> + NL802154_DEV_ADDR_ATTR_SHORT,
> + NL802154_DEV_ADDR_ATTR_EXTENDED,
> + NL802154_DEV_ADDR_ATTR_PAD,
> +
> + /* keep last */
> + __NL802154_DEV_ADDR_ATTR_AFTER_LAST,
> + NL802154_DEV_ADDR_ATTR_MAX = __NL802154_DEV_ADDR_ATTR_AFTER_LAST - 1
> +};
> +
> +enum nl802154_key_id_modes {
> + NL802154_KEY_ID_MODE_IMPLICIT,
> + NL802154_KEY_ID_MODE_INDEX,
> + NL802154_KEY_ID_MODE_INDEX_SHORT,
> + NL802154_KEY_ID_MODE_INDEX_EXTENDED,
> +
> + /* keep last */
> + __NL802154_KEY_ID_MODE_AFTER_LAST,
> + NL802154_KEY_ID_MODE_MAX = __NL802154_KEY_ID_MODE_AFTER_LAST - 1
> +};
> +
> +enum nl802154_key_id_attrs {
> + NL802154_KEY_ID_ATTR_UNSPEC,
> +
> + NL802154_KEY_ID_ATTR_MODE,
> + NL802154_KEY_ID_ATTR_INDEX,
> + NL802154_KEY_ID_ATTR_IMPLICIT,
> + NL802154_KEY_ID_ATTR_SOURCE_SHORT,
> + NL802154_KEY_ID_ATTR_SOURCE_EXTENDED,
> + NL802154_KEY_ID_ATTR_PAD,
> +
> + /* keep last */
> + __NL802154_KEY_ID_ATTR_AFTER_LAST,
> + NL802154_KEY_ID_ATTR_MAX = __NL802154_KEY_ID_ATTR_AFTER_LAST - 1
> +};
> +
> +enum nl802154_seclevels {
> + NL802154_SECLEVEL_NONE,
> + NL802154_SECLEVEL_MIC32,
> + NL802154_SECLEVEL_MIC64,
> + NL802154_SECLEVEL_MIC128,
> + NL802154_SECLEVEL_ENC,
> + NL802154_SECLEVEL_ENC_MIC32,
> + NL802154_SECLEVEL_ENC_MIC64,
> + NL802154_SECLEVEL_ENC_MIC128,
> +
> + /* keep last */
> + __NL802154_SECLEVEL_AFTER_LAST,
> + NL802154_SECLEVEL_MAX = __NL802154_SECLEVEL_AFTER_LAST - 1
> +};
> +
> +enum nl802154_frames {
> + NL802154_FRAME_BEACON,
> + NL802154_FRAME_DATA,
> + NL802154_FRAME_ACK,
> + NL802154_FRAME_CMD,
> +
> + /* keep last */
> + __NL802154_FRAME_AFTER_LAST,
> + NL802154_FRAME_MAX = __NL802154_FRAME_AFTER_LAST - 1
> +};
> +
> +enum nl802154_cmd_frames {
> + __NL802154_CMD_FRAME_INVALID,
> + NL802154_CMD_FRAME_ASSOC_REQUEST,
> + NL802154_CMD_FRAME_ASSOC_RESPONSE,
> + NL802154_CMD_FRAME_DISASSOC_NOTIFY,
> + NL802154_CMD_FRAME_DATA_REQUEST,
> + NL802154_CMD_FRAME_PAN_ID_CONFLICT_NOTIFY,
> + NL802154_CMD_FRAME_ORPHAN_NOTIFY,
> + NL802154_CMD_FRAME_BEACON_REQUEST,
> + NL802154_CMD_FRAME_COORD_REALIGNMENT,
> + NL802154_CMD_FRAME_GTS_REQUEST,
> +
> + /* keep last */
> + __NL802154_CMD_FRAME_AFTER_LAST,
> + NL802154_CMD_FRAME_MAX = __NL802154_CMD_FRAME_AFTER_LAST - 1
> +};
> +
> +enum nl802154_seclevel_attrs {
> + NL802154_SECLEVEL_ATTR_UNSPEC,
> +
> + NL802154_SECLEVEL_ATTR_LEVELS,
> + NL802154_SECLEVEL_ATTR_FRAME,
> + NL802154_SECLEVEL_ATTR_CMD_FRAME,
> + NL802154_SECLEVEL_ATTR_DEV_OVERRIDE,
> +
> + /* keep last */
> + __NL802154_SECLEVEL_ATTR_AFTER_LAST,
> + NL802154_SECLEVEL_ATTR_MAX = __NL802154_SECLEVEL_ATTR_AFTER_LAST - 1
> +};
> +
> +/* TODO what is this? couldn't find in mib */
> +enum {
> + NL802154_DEVKEY_IGNORE,
> + NL802154_DEVKEY_RESTRICT,
> + NL802154_DEVKEY_RECORD,
> +
> + /* keep last */
> + __NL802154_DEVKEY_AFTER_LAST,
> + NL802154_DEVKEY_MAX = __NL802154_DEVKEY_AFTER_LAST - 1
> +};
> +
> +enum nl802154_dev {
> + NL802154_DEV_ATTR_UNSPEC,
> +
> + NL802154_DEV_ATTR_FRAME_COUNTER,
> + NL802154_DEV_ATTR_PAN_ID,
> + NL802154_DEV_ATTR_SHORT_ADDR,
> + NL802154_DEV_ATTR_EXTENDED_ADDR,
> + NL802154_DEV_ATTR_SECLEVEL_EXEMPT,
> + NL802154_DEV_ATTR_KEY_MODE,
> + NL802154_DEV_ATTR_PAD,
> +
> + /* keep last */
> + __NL802154_DEV_ATTR_AFTER_LAST,
> + NL802154_DEV_ATTR_MAX = __NL802154_DEV_ATTR_AFTER_LAST - 1
> +};
> +
> +enum nl802154_devkey {
> + NL802154_DEVKEY_ATTR_UNSPEC,
> +
> + NL802154_DEVKEY_ATTR_FRAME_COUNTER,
> + NL802154_DEVKEY_ATTR_EXTENDED_ADDR,
> + NL802154_DEVKEY_ATTR_ID,
> + NL802154_DEVKEY_ATTR_PAD,
> +
> + /* keep last */
> + __NL802154_DEVKEY_ATTR_AFTER_LAST,
> + NL802154_DEVKEY_ATTR_MAX = __NL802154_DEVKEY_ATTR_AFTER_LAST - 1
> +};
> +
> +enum nl802154_key {
> + NL802154_KEY_ATTR_UNSPEC,
> +
> + NL802154_KEY_ATTR_ID,
> + NL802154_KEY_ATTR_USAGE_FRAMES,
> + NL802154_KEY_ATTR_USAGE_CMDS,
> + NL802154_KEY_ATTR_BYTES,
> +
> + /* keep last */
> + __NL802154_KEY_ATTR_AFTER_LAST,
> + NL802154_KEY_ATTR_MAX = __NL802154_KEY_ATTR_AFTER_LAST - 1
> +};
> +
> +#define NL802154_KEY_SIZE 16
> +#define NL802154_CMD_FRAME_NR_IDS 256
> +
> +#endif /* CONFIG_IEEE802154_NL802154_EXPERIMENTAL */
> +
> #endif /* __NL802154_H */
Reviewed-by: Stefan Schmidt<stefan@osg.samsung.com>
regards
Stefan Schmidt
next prev parent reply other threads:[~2016-05-11 15:08 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-11 9:46 [PATCH wpan-tools 1/2] nl802154: update nl802154.h Alexander Aring
2016-05-11 9:46 ` [PATCH wpan-tools 2/2] phy: add netns support Alexander Aring
2016-05-11 15:13 ` Stefan Schmidt
2016-05-12 0:19 ` Alexander Aring
2016-05-11 15:07 ` Stefan Schmidt [this message]
2016-05-12 0:18 ` [PATCH wpan-tools 1/2] nl802154: update nl802154.h Alexander Aring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=57334ACD.3040708@osg.samsung.com \
--to=stefan@osg.samsung.com \
--cc=aar@pengutronix.de \
--cc=kernel@pengutronix.de \
--cc=linux-wpan@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.