qcacmn: Limit addition of 6ghz channels to scan request

Currently for STA mode, depending on the scan_mode_6g ini value
driver will remove or add 6g channels to scan req, due to which
in some cases, scan is taking more time to complete.
Fix is to add new value to enum scan_mode_6g, when scan_mode_6g
ini value set to SCAN_MODE_6G_NO_OPERATION driver will not
modify the channel list.

Change-Id: I5b6891f142b54f4fa2fe6e9a75bf5fbd2e5f3adc
CRs-Fixed: 2783911

umac/scan/core/src/wlan_scan_manager.c

@@ -1198,12 +1198,16 @@ scm_update_channel_list(struct scan_start_request *req,
 	}
 
 	req->scan_req.chan_list.num_chan = num_scan_channels;
-	/* Dont upadte the channel list for SAP mode */
+	/* Dont update the channel list:
+	 * - if not STA mode and
+	 * - if scan mode is set to SCAN_MODE_6G_NO_OPERATION
+	 */
 	op_mode = wlan_vdev_mlme_get_opmode(req->vdev);
 	if (op_mode != QDF_SAP_MODE &&
 	    op_mode != QDF_P2P_DEVICE_MODE &&
 	    op_mode != QDF_P2P_CLIENT_MODE &&
-	    op_mode != QDF_P2P_GO_MODE) {
+	    op_mode != QDF_P2P_GO_MODE &&
+	    scan_obj->scan_def.scan_mode_6g != SCAN_MODE_6G_NO_OPERATION) {
 		scm_update_6ghz_channel_list(req->vdev,
 					     &req->scan_req.chan_list,
 					     scan_obj);

umac/scan/dispatcher/inc/wlan_scan_cfg.h

@@ -29,12 +29,14 @@
  * @SCAN_MODE_6G_NO_CHANNEL: Remove 6GHz channels in the scan request
  * @SCAN_MODE_6G_PSC_CHANNEL: Allow/Add 6Ghz PSC channels to scan request
  * @SCAN_MODE_6G_ALL_CHANNEL: Allow all the 6Ghz channels
+ * @SCAN_MODE_6G_NO_OPERATION: Don't perform any action keep channel list as is
  */
 enum scan_mode_6ghz {
 	SCAN_MODE_6G_NO_CHANNEL,
 	SCAN_MODE_6G_PSC_CHANNEL,
 	SCAN_MODE_6G_ALL_CHANNEL,
-	SCAN_MODE_6G_MAX = SCAN_MODE_6G_ALL_CHANNEL,
+	SCAN_MODE_6G_NO_OPERATION,
+	SCAN_MODE_6G_MAX = SCAN_MODE_6G_NO_OPERATION,
 };
 
 /*
@@ -1202,13 +1204,14 @@ enum scan_mode_6ghz {
  * <ini>
  * scan_mode_6ghz - 6ghz Scan mode
  * @Min: 0
- * @Max: 2
- * @Default: 2
+ * @Max: 3
+ * @Default: 1
  *
  * Configure the 6Ghz scan mode
  * 0 - Remove 6GHz channels in the scan request
  * 1 - Allow/Add 6Ghz PSC channels to scan request
  * 2 - Allow all the 6Ghz channels
+ * 3 - Don't perform any action keep channel list as is
  *
  * Related: SCAN
  *