ath10k: Set probe request oui during driver start

PATCH In review Rakesh Pillai 2 participants 3 messages Oct 2, 2018 – Oct 13, 2018 Qualcomm Atheros ATH10K wireless driver

lore

Share & tools

lore

Rakesh Pillai

author

2018-10-02 18:03 UTC #0 lore raw

PATCH 1/1 ath10k: Set probe request oui during driver start

Currently the wmi command for setting probe request oui, needed for mac randomization, is sent during the mac register. At this time, during the driver init the wmi has already been detached. This can cause unexpected behavior since the firmware is already down and the wmi has been detached.

Send the wmi command for setting probe request oui during the driver start. This will make sure that the firmware is started and wmi is initialized before we send this command.

Tested HW: WCN3990
Tested FW: WLAN.HL.2.0-01188-QCAHLSWMTPLZ-1

Fixes 60e1d0fb290197fe505dff6e4e3b7e4d258dbf60

Signed-off-by Rakesh Pillai <[email protected]>

---
 drivers/net/wireless/ath/ath10k/mac.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

drivers/net/wireless/ath/ath10k/mac.c +8 -6

index 97548f9..5e2f14b 100644
@@ -4682,6 +4682,14 @@ static int ath10k_start(struct ieee80211_hw *hw)
 		goto err_core_stop;
 	}
 
+	if (test_bit(WMI_SERVICE_SPOOF_MAC_SUPPORT, ar->wmi.svc_map)) {
+		ret = ath10k_wmi_scan_prob_req_oui(ar, ar->mac_addr);
+		if (ret) {
+			ath10k_err(ar, "failed to set prob req oui: %i\n", ret);
+			goto err_core_stop;
+		}
+	}
+
 	if (test_bit(WMI_SERVICE_ADAPTIVE_OCS, ar->wmi.svc_map)) {
 		ret = ath10k_wmi_adaptive_qcs(ar, true);
 		if (ret) {

@@ -8565,12 +8573,6 @@ int ath10k_mac_register(struct ath10k *ar)
 	}
 
 	if (test_bit(WMI_SERVICE_SPOOF_MAC_SUPPORT, ar->wmi.svc_map)) {
-		ret = ath10k_wmi_scan_prob_req_oui(ar, ar->mac_addr);
-		if (ret) {
-			ath10k_err(ar, "failed to set prob req oui: %i\n", ret);
-			goto err_dfs_detector_exit;
-		}
-
 		ar->hw->wiphy->features |=
 			NL80211_FEATURE_SCAN_RANDOM_MAC_ADDR;
 	}

Signature · 1 line

2.7.4

Kalle Valo

2018-10-13 17:17 UTC #1 lore raw

Quoted 12 lines · Rakesh Pillai

Currently the wmi command for setting probe request oui, needed for mac randomization, is sent during the mac register. At this time, during the driver init the wmi has already been detached. This can cause unexpected behavior since the firmware is already down and the wmi has been detached.
Send the wmi command for setting probe request oui during the driver start. This will make sure that the firmware is started and wmi is initialized before we send this command.

Quoted 6 lines

Tested HW: WCN3990
Tested FW: WLAN.HL.2.0-01188-QCAHLSWMTPLZ-1
Fixes 60e1d0fb290197fe505dff6e4e3b7e4d258dbf60
Signed-off-by Rakesh Pillai <[email protected]>
Signed-off-by Kalle Valo <[email protected]>

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

f1157695c527 ath10k: set probe request oui during driver start

Signature · 3 lines

https://patchwork.kernel.org/patch/10623963/

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