[PATCH v2] ath10k: remove the max_sched_scan_reqs value

[PATCH v2] ath10k: remove the max_sched_scan_reqs value

[Wen Gong]

The struct cfg80211_wowlan of NET_DETECT WoWLAN feature share the same
struct cfg80211_sched_scan_request together with scheduled scan request
feature, and max_sched_scan_reqs of wiphy is only used for sched scan,
and ath10k does not support scheduled scan request feature, so ath10k
does not set flag NL80211_FEATURE_SCHED_SCAN_RANDOM_MAC_ADDR, but ath10k
set max_sched_scan_reqs of wiphy to a non zero value 1, then function
nl80211_add_commands_unsplit of cfg80211 will set it support command
NL80211_CMD_START_SCHED_SCAN because max_sched_scan_reqs is a non zero
value, but actually ath10k not support it, then it leads a mismatch result
for sched scan of cfg80211, then application shill found the mismatch and
stop running case of MAC random address scan and then the case fail.

After remove max_sched_scan_reqs value, it keeps match for sched scan and
case of MAC random address scan pass.

Tested with QCA6174 SDIO with firmware WLAN.RMH.4.4.1-00029.
Tested with QCA6174 PCIe with firmware WLAN.RM.4.4.1-00110-QCARMSWP-1.

Fixes: ce834e280f2f875 ("ath10k: support NET_DETECT WoWLAN feature")
Signed-off-by: Wen Gong <wgong@codeaurora.org>
---
v2: change commit log
 drivers/net/wireless/ath/ath10k/mac.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index e8bdb2ba9b18..9aa499b0527e 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -8902,7 +8902,6 @@ int ath10k_mac_register(struct ath10k *ar)
 	ar->hw->wiphy->max_scan_ie_len = WLAN_SCAN_PARAMS_MAX_IE_LEN;
 
 	if (test_bit(WMI_SERVICE_NLO, ar->wmi.svc_map)) {
-		ar->hw->wiphy->max_sched_scan_reqs = 1;
 		ar->hw->wiphy->max_sched_scan_ssids = WMI_PNO_MAX_SUPP_NETWORKS;
 		ar->hw->wiphy->max_match_sets = WMI_PNO_MAX_SUPP_NETWORKS;
 		ar->hw->wiphy->max_sched_scan_ie_len = WMI_PNO_MAX_IE_LENGTH;
-- 
2.23.0

Re: [PATCH v2] ath10k: remove the max_sched_scan_reqs value

[Kalle Valo]

Wen Gong <wgong@codeaurora.org> wrote:

> The struct cfg80211_wowlan of NET_DETECT WoWLAN feature share the same
> struct cfg80211_sched_scan_request together with scheduled scan request
> feature, and max_sched_scan_reqs of wiphy is only used for sched scan,
> and ath10k does not support scheduled scan request feature, so ath10k
> does not set flag NL80211_FEATURE_SCHED_SCAN_RANDOM_MAC_ADDR, but ath10k
> set max_sched_scan_reqs of wiphy to a non zero value 1, then function
> nl80211_add_commands_unsplit of cfg80211 will set it support command
> NL80211_CMD_START_SCHED_SCAN because max_sched_scan_reqs is a non zero
> value, but actually ath10k not support it, then it leads a mismatch result
> for sched scan of cfg80211, then application shill found the mismatch and
> stop running case of MAC random address scan and then the case fail.
> 
> After remove max_sched_scan_reqs value, it keeps match for sched scan and
> case of MAC random address scan pass.
> 
> Tested with QCA6174 SDIO with firmware WLAN.RMH.4.4.1-00029.
> Tested with QCA6174 PCIe with firmware WLAN.RM.4.4.1-00110-QCARMSWP-1.
> 
> Fixes: ce834e280f2f875 ("ath10k: support NET_DETECT WoWLAN feature")
> Signed-off-by: Wen Gong <wgong@codeaurora.org>
> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

Patch applied to ath-next branch of ath.git, thanks.

d431f8939c14 ath10k: remove the max_sched_scan_reqs value

-- 
https://patchwork.kernel.org/patch/11243015/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches