瀏覽代碼

qcacmn: Don't scan 6 GHz channels if fcc constraint set

If fcc constraint is set host disables all 6 GHz channels
except for the STA, P2P client connect 6 GHz channels,
but host shouldn't scan any 6 GHz channels.
Add changes to filter out 6 GHz channels from scan list.

Change-Id: Ibc6b34a5d294d1d11f1717be135030760359bd53
CRs-Fixed: 3481006
Asutosh Mohapatra 2 年之前
父節點
當前提交
40d067432f
共有 2 個文件被更改,包括 10 次插入0 次删除
  1. 5 0
      umac/scan/core/src/wlan_scan_manager.c
  2. 5 0
      umac/scan/core/src/wlan_scan_manager_6ghz.c

+ 5 - 0
umac/scan/core/src/wlan_scan_manager.c

@@ -1029,6 +1029,11 @@ scm_update_channel_list(struct scan_start_request *req,
 		uint32_t freq;
 
 		freq = req->scan_req.chan_list.chan[i].freq;
+		if ((wlan_reg_is_6ghz_chan_freq(freq) &&
+		     !wlan_reg_is_6ghz_band_set(pdev))) {
+			scm_nofl_debug("Skip 6 GHz freq = %d", freq);
+			continue;
+		}
 		if (skip_dfs_ch &&
 		    wlan_reg_chan_has_dfs_attribute_for_freq(pdev, freq)) {
 			scm_nofl_debug("Skip DFS freq %d", freq);

+ 5 - 0
umac/scan/core/src/wlan_scan_manager_6ghz.c

@@ -523,6 +523,11 @@ scm_update_6ghz_channel_list(struct scan_start_request *req,
 	    op_mode == QDF_P2P_GO_MODE)
 		return;
 
+	if (!wlan_reg_is_6ghz_band_set(pdev)) {
+		scm_debug("6 GHz band disabled.");
+		return;
+	}
+
 	scan_mode = scan_obj->scan_def.scan_mode_6g;
 	scm_debug("6g scan mode %d", scan_mode);