Add support to configure beacon tx mode
v2 cover Add support to configure beacon tx mode
Add support to configure the beacon tx mode as STAGGERED or BURST mode via hostapd configuration during the AP bring-up or via wpa_suppplicant configuration during MESH bring-up.
Beacons can be sent out in burst(continuously in a single shot one after another) or staggered (equally spread out over beacon interval) mode.
V2:
Addressed Johannes's comment on v1 patch.
Updated the commit log.
Maharaja Kennadyrajan (3):
nl80211: Add support for beacon tx mode
mac80211: Add support for beacon tx mode
ath11k: Add support for beacon tx mode
drivers/net/wireless/ath/ath11k/mac.c | 10 +++++++--- include/net/cfg80211.h | 4 ++++ include/net/mac80211.h | 2 ++ include/uapi/linux/nl80211.h | 15 +++++++++++++++ net/mac80211/cfg.c | 2 ++ net/wireless/nl80211.c | 9 +++++++++ 6 files changed, 39 insertions(+), 3 deletions(-)
Signature · 1 line
2.7.4
PATCH v2 1/3 nl80211: Add support for beacon tx mode
User can configure the below beacon tx mode
1. Staggered mode and 2. Burst mode while bring-up the AP or MESH.
Beacons can be sent out in burst(continuously in a single shot one after another) or staggered (equally spread out over beacon interval) mode.
Set the beacon_tx_mode as 1 for Staggered mode and 2 for burst mode.
Hence, added the support in the nl80211/cfg80211 layer to honour the beacon tx mode configuration and pass this value to the driver.
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.5.0.1-00630-QCAHKSWPL_SILICONZ-2
---
V2:
Addressed Johannes's comment on v1 patch.
Updated the commit log.
include/net/cfg80211.h | 4 ++++ include/uapi/linux/nl80211.h | 15 +++++++++++++++ net/wireless/nl80211.c | 9 +++++++++ 3 files changed, 28 insertions(+)
include/net/cfg80211.h +4 -0
@@ -1182,6 +1182,7 @@ enum cfg80211_ap_settings_flags {* @he_oper: HE operation IE (or %NULL if HE isn't enabled) * @fils_discovery: FILS discovery transmission parameters * @unsol_bcast_probe_resp: Unsolicited broadcast probe response parameters +* @beacon_tx_mode: Beacon Tx Mode setting */ struct cfg80211_ap_settings {struct cfg80211_chan_def chandef;
@@ -1214,6 +1215,7 @@ struct cfg80211_ap_settings {struct cfg80211_he_bss_color he_bss_color;struct cfg80211_fils_discovery fils_discovery;struct cfg80211_unsol_bcast_probe_resp unsol_bcast_probe_resp; +enum nl80211_beacon_tx_mode beacon_tx_mode; };/**
@@ -2061,6 +2063,7 @@ struct mesh_config {* to operate on DFS channels. * @control_port_over_nl80211: TRUE if userspace expects to exchange control * port frames over NL80211 instead of the network interface. +* @beacon_tx_mode: Beacon Tx Mode setting. * * These parameters are fixed when the mesh is created. */
@@ -2084,6 +2087,7 @@ struct mesh_setup {struct cfg80211_bitrate_mask beacon_rate;bool userspace_handles_dfs;bool control_port_over_nl80211; +enum nl80211_beacon_tx_mode beacon_tx_mode; };/**
include/uapi/linux/nl80211.h +15 -0
@@ -2560,6 +2560,10 @@ enum nl80211_commands {* disassoc events to indicate that an immediate reconnect to the AP * is desired. * +* @NL80211_ATTR_BEACON_TX_MODE: used to configure the beacon tx mode as +* staggered mode = 1 or burst mode = 2 in %NL80211_CMD_START_AP or +* %NL80211_CMD_JOIN_MESH from user-space. +* * @NUM_NL80211_ATTR: total number of nl80211_attrs available * @NL80211_ATTR_MAX: highest attribute number currently defined * @__NL80211_ATTR_AFTER_LAST: internal use
@@ -3057,6 +3061,8 @@ enum nl80211_attrs {NL80211_ATTR_DISABLE_HE , +NL80211_ATTR_BEACON_TX_MODE , +/* add attributes here, update the policy in nl80211.c */ __NL80211_ATTR_AFTER_LAST,
@@ -7299,4 +7305,13 @@ enum nl80211_sar_specs_attrs { NL80211_SAR_ATTR_SPECS_MAX = __NL80211_SAR_ATTR_SPECS_LAST - 1, }; +/** +* enum nl80211_beacon_tx_mode - Beacon Tx Mode enum. +* Used to configure beacon staggered mode or beacon burst mode. +*/ +enum nl80211_beacon_tx_mode { +NL80211_BEACON_STAGGERED_MODE =1 , +NL80211_BEACON_BURST_MODE =2 , +}; +#endif /* __LINUX_NL80211_H */
net/wireless/nl80211.c +9 -0
@@ -759,6 +759,7 @@ static const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = { [NL80211_ATTR_RECONNECT_REQUESTED] = { .type = NLA_REJECT }, [NL80211_ATTR_SAR_SPEC] = NLA_POLICY_NESTED(sar_policy), [NL80211_ATTR_DISABLE_HE] = { .type = NLA_FLAG }, + [NL80211_ATTR_BEACON_TX_MODE] = NLA_POLICY_RANGE(NLA_U32, 1, 2), };/* policy for the key attributes */
@@ -5330,6 +5331,10 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info) params.dtim_period =nla_get_u32 (info->attrs[NL80211_ATTR_DTIM_PERIOD ]); +if (info->attrs[NL80211_ATTR_BEACON_TX_MODE ]) + params.beacon_tx_mode = +nla_get_u32 (info->attrs[NL80211_ATTR_BEACON_TX_MODE ]); + err =cfg80211_validate_beacon_int (rdev, dev->ieee80211_ptr->iftype, params.beacon_interval);if (err)
@@ -11884,6 +11889,10 @@ static int nl80211_join_mesh(struct sk_buff *skb, struct genl_info *info)return -EINVAL ; } +if (info->attrs[NL80211_ATTR_BEACON_TX_MODE ]) + setup.beacon_tx_mode = +nla_get_u32 (info->attrs[NL80211_ATTR_BEACON_TX_MODE ]); +if (info->attrs[NL80211_ATTR_MESH_SETUP ]) {/* parse additional setup parameters if given */ err =nl80211_parse_mesh_setup (info, &setup);
Signature · 7 lines
2.7.4 -- ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
Re: [PATCH v2 1/3] nl80211: Add support for beacon tx mode
On 2021-04-29 04:47, Maharaja Kennadyrajan wrote:
[..snip..]
Quoted 9 lines
include/uapi/linux/nl80211.h +9
-0+/** +* enum nl80211_beacon_tx_mode - Beacon Tx Mode enum. +* Used to configure beacon staggered mode or beacon burst mode. +*/ +enum nl80211_beacon_tx_mode { +NL80211_BEACON_STAGGERED_MODE =1 , +NL80211_BEACON_BURST_MODE =2 , +}; +
[..snip..]
net/wireless/nl80211.c static int nl80211_start_ap(struct sk_buff *skb, · line 5339
Quoted 10 lines
net/wireless/nl80211.c +4
-0@@ -5330,6 +5331,10 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info) params.dtim_period =nla_get_u32 (info->attrs[NL80211_ATTR_DTIM_PERIOD ]); +if (info->attrs[NL80211_ATTR_BEACON_TX_MODE ]) + params.beacon_tx_mode = +nla_get_u32 (info->attrs[NL80211_ATTR_BEACON_TX_MODE ]); +
Note that in the case where NL80211_ATTR_BEACON_TX_MODE is not specified that beacon_tx_mode will be zero, which is not a valid nl80211_beacon_tx_mode enumeration.
Should you renumber the nl80211_beacon_tx_mode enumerations so that the default mode has a value of 0? Or add NL80211_BEACON_DEFAULT_MODE = 0 and allow the driver to select a default mode?
Re: [PATCH v2 1/3] nl80211: Add support for beacon tx mode
Quoted 28 lines · On 2021-05-03 22:54, [email protected] wrote:
On 2021-04-29 04:47, Maharaja Kennadyrajan wrote:
[..snip..]Quoted 9 lines
include/uapi/linux/nl80211.h +9
-0+/** +* enum nl80211_beacon_tx_mode - Beacon Tx Mode enum. +* Used to configure beacon staggered mode or beacon burst mode. +*/ +enum nl80211_beacon_tx_mode { +NL80211_BEACON_STAGGERED_MODE =1 , +NL80211_BEACON_BURST_MODE =2 , +}; +[..snip..]
net/wireless/nl80211.c static int nl80211_start_ap(struct sk_buff · line 5340
Quoted 11 lines
net/wireless/nl80211.c +4
-0@@ -5330,6 +5331,10 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info) params.dtim_period =nla_get_u32 (info->attrs[NL80211_ATTR_DTIM_PERIOD ]); +if (info->attrs[NL80211_ATTR_BEACON_TX_MODE ]) + params.beacon_tx_mode = +nla_get_u32 (info->attrs[NL80211_ATTR_BEACON_TX_MODE ]); +Note that in the case where
NL80211_ATTR_BEACON_TX_MODEis not specified thatbeacon_tx_modewill be zero, which is not a validnl80211_beacon_tx_modeenumeration.
Quoted 4 lines
Should you renumber the
nl80211_beacon_tx_modeenumerations so that the default mode has a value of 0? Or addNL80211_BEACON_DEFAULT_MODE= 0 and allow the driver
to select a default mode?
[Maha]: Yes, it will select the default mode as STAGGERED mode when the user set beacon_tx_mode as 0 in the hostapd conf file.
Also, it will select the default mode as STAGGERED mode when the user didn't add beacon_tx_mode config in the hostapd conf file.
This is how it is handled here already.
Regards,
Maha
Re: [PATCH v2 1/3] nl80211: Add support for beacon tx mode
Quoted 35 lines · Maharaja Kennadyrajan
Quoted 29 lines · On 2021-05-03 22:54, [email protected] wrote:
On 2021-04-29 04:47, Maharaja Kennadyrajan wrote:
[..snip..]Quoted 10 lines
+/**
+ * enumnl80211_beacon_tx_mode- Beacon Tx Mode enum.
+ * Used to configure beacon staggered mode or beacon burst
mode.
+ */include/uapi/linux/nl80211.h +5
-0+enum nl80211_beacon_tx_mode { +NL80211_BEACON_STAGGERED_MODE =1 , +NL80211_BEACON_BURST_MODE =2 , +}; +[..snip..]
net/wireless/nl80211.c static int nl80211_start_ap(struct sk_buff · line 5340
Quoted 11 lines
net/wireless/nl80211.c +4
-0@@ -5330,6 +5331,10 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info) params.dtim_period =nla_get_u32 (info->attrs[NL80211_ATTR_DTIM_PERIOD ]); +if (info->attrs[NL80211_ATTR_BEACON_TX_MODE ]) + params.beacon_tx_mode = +nla_get_u32 (info->attrs[NL80211_ATTR_BEACON_TX_MODE ]); +Note that in the case where
NL80211_ATTR_BEACON_TX_MODEis not specified thatbeacon_tx_modewill be zero, which is not a validnl80211_beacon_tx_modeenumeration.Quoted 4 lines
Should you renumber the
nl80211_beacon_tx_modeenumerations so that the default mode has a value of 0? Or addNL80211_BEACON_DEFAULT_MODE= 0 and allow the driver
to select a default mode?
Quoted 5 lines
[Maha]: Yes, it will select the default mode as STAGGERED mode when the user set
beacon_tx_modeas 0 in the hostapd conf file.
Also, it will select the default mode as STAGGERED mode when the user didn't addbeacon_tx_modeconfig in the hostapd conf file.
This is how it is handled here already.
Regardless of how it is handled, I still assert that there is a coding/logic error here since in the case the attribute is not present you send an invalid enumeration (0) to the driver. I'm suggesting to fix that logic/coding error either by renumbering the existing enumerations or by adding a new enumeration so that 0 is a valid enumeration.
Signature · 3 lines
ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH v2 2/3 mac80211: Add support for beacon tx mode
In reply to Maharaja KennadyrajanPass the beacon tx mode value from the nl80211/cfg80211 layer to the driver via ieee80211_ops and driver ops.
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.5.0.1-00480-QCAHKSWPL_SILICONZ-1
--- include/net/mac80211.h | 2 ++ net/mac80211/cfg.c | 2 ++ 2 files changed, 4 insertions(+)
include/net/mac80211.h +2 -0
@@ -631,6 +631,7 @@ struct ieee80211_fils_discovery {* @s1g: BSS is S1G BSS (affects Association Request format). * @beacon_tx_rate: The configured beacon transmit rate that needs to be passed * to driver when rate control is offloaded to firmware. +* @beacon_tx_mode: Beacon Tx Mode setting. */ struct ieee80211_bss_conf {const u8 *bssid;
@@ -700,6 +701,7 @@ struct ieee80211_bss_conf {u32 unsol_bcast_probe_resp_interval;bool s1g;struct cfg80211_bitrate_mask beacon_tx_rate; +enum nl80211_beacon_tx_mode beacon_tx_mode; };/**
net/mac80211/cfg.c +2 -0
@@ -1063,6 +1063,7 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev, prev_beacon_int = sdata->vif.bss_conf.beacon_int; sdata->vif.bss_conf.beacon_int = params->beacon_interval; + sdata->vif.bss_conf.beacon_tx_mode = params->beacon_tx_mode;if (params->he_cap && params->he_oper) { sdata->vif.bss_conf.he_support = true;
@@ -2094,6 +2095,7 @@ static int copy_mesh_setup(struct ieee80211_if_mesh *ifmsh, sdata->vif.bss_conf.beacon_int = setup->beacon_interval; sdata->vif.bss_conf.dtim_period = setup->dtim_period; + sdata->vif.bss_conf.beacon_tx_mode = setup->beacon_tx_mode; sdata->beacon_rate_set = false; if (wiphy_ext_feature_isset(sdata->local->hw.wiphy,
Signature · 1 line
2.7.4
PATCH v2 3/3 ath11k: Add support for beacon tx mode
In reply to Maharaja KennadyrajanAdd support to configure the beacon tx mode in
the driver.
Beacons can be sent out in burst(continuously in a single shot one after another) or staggered (equally spread out over beacon interval) mode.
Use the below configuration in the hostapd/wpa_supplicant for AP/MESH mode to configure the beacon tx mode.
"beacon_tx_mode=N", where N = 1 for STAGGERED beacon mode and N = 2 for BURST beacon mode.
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.5.0.1-00480-QCAHKSWPL_SILICONZ-1
--- drivers/net/wireless/ath/ath11k/mac.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/net/wireless/ath/ath11k/mac.c +7 -3
@@ -2130,7 +2130,10 @@ static void ath11k_mac_op_bss_info_changed(struct ieee80211_hw *hw,if (changed &BSS_CHANGED_BEACON ) { param_id =WMI_PDEV_PARAM_BEACON_TX_MODE ; - param_value =WMI_BEACON_STAGGERED_MODE ; +if (info->beacon_tx_mode ==NL80211_BEACON_BURST_MODE ) + param_value =WMI_BEACON_BURST_MODE ; +else + param_value =WMI_BEACON_STAGGERED_MODE ; ret =ath11k_wmi_pdev_set_param (ar, param_id, param_value, ar->pdev->pdev_id);if (ret)
@@ -2138,8 +2141,9 @@ static void ath11k_mac_op_bss_info_changed(struct ieee80211_hw *hw, arvif->vdev_id); else ath11k_dbg(ar->ab, ATH11K_DBG_MAC, -"Set staggered beacon mode for VDEV: %d\n" , - arvif->vdev_id); +"Set %s beacon mode for VDEV: %d mode: %d\n" , + param_value ?"burst" :"staggered" , + arvif->vdev_id, param_value); ret =ath11k_mac_setup_bcn_tmpl (arvif);if (ret)
Signature · 1 line
2.7.4
On Thursday, 29 April 2021 13:47:51 CEST Maharaja Kennadyrajan wrote:
[...]
Quoted 7 lines
Beacons can be sent out in burst(continuously in a single shot one after another) or staggered (equally spread out over beacon interval) mode.
V2:
Addressed Johannes's comment on v1 patch.
Updated the commit log.
Still it is advertised as vif setting but the code itself shows that it is a phy setting (as you would expect). Or is it a potential feature for a device to send some beacons staggered and some beacons as burst?
Kind regards,
Sven
Quoted 6 lines · Sven Eckelmann
On Thursday, 29 April 2021 13:47:51 CEST Maharaja Kennadyrajan wrote:
[...]Quoted 4 lines
Beacons can be sent out in burst(continuously in a single shot one after another) or staggered (equally spread out over beacon interval) mode.
Quoted 7 lines
Quoted 3 lines
V2:
Addressed Johannes's comment on v1 patch.
Updated the commit log.Still it is advertised as vif setting but the code itself shows that it is a phy setting (as you would expect). Or is it a potential feature for a device to send some beacons staggered and some beacons as burst?
[Maha]: No, it won't allow to send some beacons in staggered and some beacons in burst mode. It will send either staggered or burst mode at a time in a device.
Quoted 2 lines
Kind regards,
Sven