diff mbox series

[04/12] nl80211: support setting S1G short beacon period

Message ID 20220711010816.45927-5-kieran.frewen@morsemicro.com (mailing list archive)
State Changes Requested
Delegated to: Johannes Berg
Headers show
Series Additional support for 802.11ah (S1G) | expand

Commit Message

Kieran Frewen July 11, 2022, 1:08 a.m. UTC 
With the kernel able to send both short and long S1G beacons, include
the ability for setting the short beacon period.

Signed-off-by: Kieran Frewen <kieran.frewen@morsemicro.com>
Signed-off-by: Bassem Dawood <bassem@morsemicro.com>
---
 include/uapi/linux/nl80211.h | 6 ++++++
 net/wireless/nl80211.c       | 4 ++++
 2 files changed, 10 insertions(+)

Comments

Jeff Johnson July 12, 2022, 10:08 p.m. UTC | #1 
On 7/10/2022 6:08 PM, Kieran Frewen wrote:
> With the kernel able to send both short and long S1G beacons, include
> the ability for setting the short beacon period.
> 
> Signed-off-by: Kieran Frewen <kieran.frewen@morsemicro.com>
> Signed-off-by: Bassem Dawood <bassem@morsemicro.com>
> ---
>   include/uapi/linux/nl80211.h | 6 ++++++
>   net/wireless/nl80211.c       | 4 ++++
>   2 files changed, 10 insertions(+)
> 
> diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h
> index 89f64f46b98d..bd6e2cae1dd3 100644
> --- a/include/uapi/linux/nl80211.h
> +++ b/include/uapi/linux/nl80211.h
> @@ -2694,6 +2694,8 @@ enum nl80211_commands {
>    *	connection. Used with %NL80211_CMD_CONNECT. If this attribute is not
>    *	included in NL80211_CMD_CONNECT drivers must not perform MLO connection.
>    *
> + * @NL80211_ATTR_SHORT_BEACON_PERIOD: S1G short beacon period in TUs.
> + *
>    * @NUM_NL80211_ATTR: total number of nl80211_attrs available
>    * @NL80211_ATTR_MAX: highest attribute number currently defined
>    * @__NL80211_ATTR_AFTER_LAST: internal use
> @@ -3214,6 +3216,8 @@ enum nl80211_attrs {
>   
>   	NL80211_ATTR_MLO_SUPPORT,
>   
> +	NL80211_ATTR_SHORT_BEACON_PERIOD,
> +
>   	/* add attributes here, update the policy in nl80211.c */
>   
>   	__NL80211_ATTR_AFTER_LAST,
> @@ -4890,6 +4894,7 @@ enum nl80211_bss_scan_width {
>    *	Contains a nested array of signal strength attributes (u8, dBm),
>    *	using the nesting index as the antenna number.
>    * @NL80211_BSS_FREQUENCY_OFFSET: frequency offset in KHz
> + * @NL80211_BSS_SHORT_BEACON_PERIOD: S1G short beacon period in TUs
>    * @__NL80211_BSS_AFTER_LAST: internal
>    * @NL80211_BSS_MAX: highest BSS attribute
>    */
> @@ -4915,6 +4920,7 @@ enum nl80211_bss {
>   	NL80211_BSS_PARENT_BSSID,
>   	NL80211_BSS_CHAIN_SIGNAL,
>   	NL80211_BSS_FREQUENCY_OFFSET,
> +	NL80211_BSS_SHORT_BEACON_PERIOD,

please rebase against latest wireless-next since a new attribute 
NL80211_BSS_MLO_LINK_ID was very recently added

>   
>   	/* keep last */
>   	__NL80211_BSS_AFTER_LAST,
> diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
> index 6a45801c783c..ab47e4130141 100644
> --- a/net/wireless/nl80211.c
> +++ b/net/wireless/nl80211.c
> @@ -798,6 +798,7 @@ static const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = {
>   		NLA_POLICY_RANGE(NLA_U8, 0, IEEE80211_MLD_MAX_NUM_LINKS),
>   	[NL80211_ATTR_MLD_ADDR] = NLA_POLICY_EXACT_LEN(ETH_ALEN),
>   	[NL80211_ATTR_MLO_SUPPORT] = { .type = NLA_FLAG },
> +	[NL80211_ATTR_SHORT_BEACON_PERIOD] = { .type = NLA_U32 },

entire range of u32 values are valid?

IEEE Std 802.11-2020 Figure 9-684—Short Beacon Interval element format 
indicates a 2 octet field, so consider either changing the type to U16 
or use NLA_POLICY_RANGE() to align with the MIB definition:
dot11ShortBeaconPeriod OBJECT-TYPE
SYNTAX Unsigned32 (1..65535)


>   };
>   
>   /* policy for the key attributes */
> @@ -5654,6 +5655,9 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info)
>   		nla_get_u32(info->attrs[NL80211_ATTR_BEACON_INTERVAL]);
>   	params->dtim_period =
>   		nla_get_u32(info->attrs[NL80211_ATTR_DTIM_PERIOD]);
> +	if (info->attrs[NL80211_ATTR_SHORT_BEACON_PERIOD])
> +		params->short_beacon_period =
> +			nla_get_u32(info->attrs[NL80211_ATTR_SHORT_BEACON_PERIOD]);
>   
>   	err = cfg80211_validate_beacon_int(rdev, dev->ieee80211_ptr->iftype,
>   					   params->beacon_interval);
diff mbox series

Patch

diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h
index 89f64f46b98d..bd6e2cae1dd3 100644
--- a/include/uapi/linux/nl80211.h
+++ b/include/uapi/linux/nl80211.h
@@ -2694,6 +2694,8 @@  enum nl80211_commands {
  *	connection. Used with %NL80211_CMD_CONNECT. If this attribute is not
  *	included in NL80211_CMD_CONNECT drivers must not perform MLO connection.
  *
+ * @NL80211_ATTR_SHORT_BEACON_PERIOD: S1G short beacon period in TUs.
+ *
  * @NUM_NL80211_ATTR: total number of nl80211_attrs available
  * @NL80211_ATTR_MAX: highest attribute number currently defined
  * @__NL80211_ATTR_AFTER_LAST: internal use
@@ -3214,6 +3216,8 @@  enum nl80211_attrs {
 
 	NL80211_ATTR_MLO_SUPPORT,
 
+	NL80211_ATTR_SHORT_BEACON_PERIOD,
+
 	/* add attributes here, update the policy in nl80211.c */
 
 	__NL80211_ATTR_AFTER_LAST,
@@ -4890,6 +4894,7 @@  enum nl80211_bss_scan_width {
  *	Contains a nested array of signal strength attributes (u8, dBm),
  *	using the nesting index as the antenna number.
  * @NL80211_BSS_FREQUENCY_OFFSET: frequency offset in KHz
+ * @NL80211_BSS_SHORT_BEACON_PERIOD: S1G short beacon period in TUs
  * @__NL80211_BSS_AFTER_LAST: internal
  * @NL80211_BSS_MAX: highest BSS attribute
  */
@@ -4915,6 +4920,7 @@  enum nl80211_bss {
 	NL80211_BSS_PARENT_BSSID,
 	NL80211_BSS_CHAIN_SIGNAL,
 	NL80211_BSS_FREQUENCY_OFFSET,
+	NL80211_BSS_SHORT_BEACON_PERIOD,
 
 	/* keep last */
 	__NL80211_BSS_AFTER_LAST,
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 6a45801c783c..ab47e4130141 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -798,6 +798,7 @@  static const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = {
 		NLA_POLICY_RANGE(NLA_U8, 0, IEEE80211_MLD_MAX_NUM_LINKS),
 	[NL80211_ATTR_MLD_ADDR] = NLA_POLICY_EXACT_LEN(ETH_ALEN),
 	[NL80211_ATTR_MLO_SUPPORT] = { .type = NLA_FLAG },
+	[NL80211_ATTR_SHORT_BEACON_PERIOD] = { .type = NLA_U32 },
 };
 
 /* policy for the key attributes */
@@ -5654,6 +5655,9 @@  static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info)
 		nla_get_u32(info->attrs[NL80211_ATTR_BEACON_INTERVAL]);
 	params->dtim_period =
 		nla_get_u32(info->attrs[NL80211_ATTR_DTIM_PERIOD]);
+	if (info->attrs[NL80211_ATTR_SHORT_BEACON_PERIOD])
+		params->short_beacon_period =
+			nla_get_u32(info->attrs[NL80211_ATTR_SHORT_BEACON_PERIOD]);
 
 	err = cfg80211_validate_beacon_int(rdev, dev->ieee80211_ptr->iftype,
 					   params->beacon_interval);