Add support to configure beacon tx mode
PATCH 1/3 nl80211: Add support for beacon tx mode
In reply to Maharaja KennadyrajanUser can configure the beacon tx mode while bring-up the AP or MESH. 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
--- 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
@@ -1181,6 +1181,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;
@@ -1213,6 +1214,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; };/**
@@ -2060,6 +2062,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. */
@@ -2083,6 +2086,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
@@ -2557,6 +2557,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
@@ -3054,6 +3058,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,
@@ -7277,4 +7283,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
@@ -753,6 +753,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 */
@@ -5324,6 +5325,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)
@@ -11878,6 +11883,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
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.
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 · 7 lines
2.7.4 -- ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH 2/3 mac80211: Add support for beacon tx mode
Pass 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;
@@ -2092,6 +2093,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 · 7 lines
2.7.4 -- ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
PATCH 3/3 ath11k: Add support for beacon tx mode
In reply to Maharaja KennadyrajanAdd support to configure the beacon tx mode in
the driver.
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
@@ -2062,7 +2062,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)
@@ -2070,8 +2073,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 · 7 lines
2.7.4 -- ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
Re: [PATCH 1/3] nl80211: Add support for beacon tx mode
In reply to Maharaja KennadyrajanQuoted 4 lines · On Monday, 22 February 2021 11:09:31 CET Maharaja Kennadyrajan wrote:
User can configure the beacon tx mode while bring-up the AP or MESH. Hence, added the support in the nl80211/cfg80211 layer to honour the beacon tx mode configuration and pass this value to the driver.
There is not a definition what this actually means. But I am guessing that you are mean the way the HW sends our the beacons for a multivif (beaconing) setup. And in this case, it is a per "phy" setting and not a per AP/meshpoint setting, right?
Kind regards,
Sven
Johannes Berg
maintainerRe: [PATCH 1/3] nl80211: Add support for beacon tx mode
Quoted 10 lines · Sven Eckelmann
Quoted 4 lines · On Monday, 22 February 2021 11:09:31 CET Maharaja Kennadyrajan wrote:
User can configure the beacon tx mode while bring-up the AP or MESH. Hence, added the support in the nl80211/cfg80211 layer to honour the beacon tx mode configuration and pass this value to the driver.
There is not a definition what this actually means. But I am guessing that you are mean the way the HW sends our the beacons for a multivif (beaconing) setup. And in this case, it is a per "phy" setting and not a per AP/meshpoint setting, right?
In addition, the commit logs are not explaining anything, why you'd use it, why it's necessary, etc.
I'll say it again: @codeaurora folks, consider the community, not just your own driver. I'm really getting tired of having to extract information from you.
johannes