ath10k: avoid leaving .bss_info_changed prematurely
PATCH v3 1/1 ath10k: avoid leaving .bss_info_changed prematurely
From: Sven Eckelmann <[email protected]>
ath10k_bss_info_changed() handles various events from the upper layers. It parses the changed bitfield and then configures the driver/firmware accordingly. Each detected event is handled in a separate scope which is independent of each other - but in the same function.
The commit f279294e9ee2 ("ath10k: add support for configuring management packet rate") changed this behavior by returning from this function prematurely when some precondition was not fulfilled. All new event handlers added after the BSS_CHANGED_BASIC_RATES event handler would then also be skipped.
---
Cc: Kalle Valo <[email protected]>
Cc: Sriram R <[email protected]>
Only compile tested
v3:
* rebased on top of commit 9e80ad37f678 ("ath10k: Drop WARN_ON()s that always trigger during system resume")
v2:
* rebased on top of commit 9e7251fa3897 ("ath10k: Check tx_stats before use it")
drivers/net/wireless/ath/ath10k/mac.c | 62 ++++++++++++++++----------- 1 file changed, 36 insertions(+), 26 deletions(-)
drivers/net/wireless/ath/ath10k/mac.c +36 -26
@@ -5634,6 +5634,37 @@ static void ath10k_configure_filter(struct ieee80211_hw *hw,mutex_unlock (&ar->conf_mutex); } +static void ath10k_recalculate_mgmt_rate (struct ath10k *ar, +struct ieee80211_vif *vif, +struct cfg80211_chan_def *def) +{ +struct ath10k_vif *arvif = (void *)vif->drv_priv; +const struct ieee80211_supported_band *sband; +u8 basic_rate_idx; +int hw_rate_code; +u32 vdev_param; +u16 bitrate; +int ret; + +lockdep_assert_held (&ar->conf_mutex); + + sband = ar->hw->wiphy->bands[def->chan->band]; + basic_rate_idx =ffs (vif->bss_conf.basic_rates) -1 ; + bitrate = sband->bitrates[basic_rate_idx].bitrate; + + hw_rate_code =ath10k_mac_get_rate_hw_value (bitrate); +if (hw_rate_code <0 ) { +ath10k_warn (ar,"bitrate not supported %d\n" , bitrate); +return ; + } + + vdev_param = ar->wmi.vdev_param->mgmt_rate; + ret =ath10k_wmi_vdev_set_param (ar, arvif->vdev_id, vdev_param, + hw_rate_code); +if (ret) +ath10k_warn (ar,"failed to set mgmt tx rate %d\n" , ret); +} + static void ath10k_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct ieee80211_bss_conf *info,
@@ -5644,10 +5675,9 @@ static void ath10k_bss_info_changed(struct ieee80211_hw *hw,struct cfg80211_chan_def def;u32 vdev_param, pdev_param, slottime, preamble;u16 bitrate, hw_value; -u8 rate, basic_rate_idx, rateidx; -int ret =0 , hw_rate_code, mcast_rate; +u8 rate, rateidx; +int ret =0 , mcast_rate;enum nl80211_band band; -const struct ieee80211_supported_band *sband;mutex_lock (&ar->conf_mutex);
@@ -5871,29 +5901,9 @@ static void ath10k_bss_info_changed(struct ieee80211_hw *hw, arvif->vdev_id, ret); } -if (changed &BSS_CHANGED_BASIC_RATES ) { -if (ath10k_mac_vif_chan (vif, &def)) { -mutex_unlock (&ar->conf_mutex); -return ; - } - - sband = ar->hw->wiphy->bands[def.chan->band]; - basic_rate_idx =ffs (vif->bss_conf.basic_rates) -1 ; - bitrate = sband->bitrates[basic_rate_idx].bitrate; - - hw_rate_code =ath10k_mac_get_rate_hw_value (bitrate); -if (hw_rate_code <0 ) { -ath10k_warn (ar,"bitrate not supported %d\n" , bitrate); -mutex_unlock (&ar->conf_mutex); -return ; - } - - vdev_param = ar->wmi.vdev_param->mgmt_rate; - ret =ath10k_wmi_vdev_set_param (ar, arvif->vdev_id, vdev_param, - hw_rate_code); -if (ret) -ath10k_warn (ar,"failed to set mgmt tx rate %d\n" , ret); - } +if (changed &BSS_CHANGED_BASIC_RATES && + !ath10k_mac_vif_chan (arvif->vif, &def)) +ath10k_recalculate_mgmt_rate (ar, vif, &def);mutex_unlock (&ar->conf_mutex); }
Signature · 7 lines
2.20.1 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Quoted 5 lines · Sven Eckelmann
ath10k_bss_info_changed()handles various events from the upper layers. It parses the changed bitfield and then configures the driver/firmware accordingly. Each detected event is handled in a separate scope which is independent of each other - but in the same function.
Quoted 8 lines
The commit
f279294e9ee2("ath10k: add support for configuring management packet rate") changed this behavior by returning from this function prematurely when some precondition was not fulfilled. All new event handlers added after theBSS_CHANGED_BASIC_RATESevent handler would then also be skipped.Signed-off-by Sven Eckelmann <[email protected]>Signed-off-by Kalle Valo <[email protected]>
Patch applied to ath-next branch of ath.git, thanks.
0227ff3656f2 ath10k: avoid leaving .bss_info_changed prematurely
Signature · 9 lines
https://patchwork.kernel.org/patch/11029683/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Quoted 5 lines · Sven Eckelmann
ath10k_bss_info_changed()handles various events from the upper layers. It parses the changed bitfield and then configures the driver/firmware accordingly. Each detected event is handled in a separate scope which is independent of each other - but in the same function.
Quoted 8 lines
The commit
f279294e9ee2("ath10k: add support for configuring management packet rate") changed this behavior by returning from this function prematurely when some precondition was not fulfilled. All new event handlers added after theBSS_CHANGED_BASIC_RATESevent handler would then also be skipped.Signed-off-by Sven Eckelmann <[email protected]>Signed-off-by Kalle Valo <[email protected]>
Patch applied to ath-next branch of ath.git, thanks.
0227ff3656f2 ath10k: avoid leaving .bss_info_changed prematurely
Signature · 3 lines
https://patchwork.kernel.org/patch/11029683/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches