qcacld-3.0: Fix treating channel id as frequency issue for SAP

There are CSA IE/beacon template cmd with duplicate IE COUNT: 10.
And interval of 2nd IE COUNT: 10 and IE COUNT: 9 is much less than
100 ms.
Radar is triggered,  tried to switch to channel 11, but set
target chan id 11 as frequency 11 wrongly,   frequency 11 is illegal
and disabled, then switch to new freq: 2412 again.

Change-Id: Id2e5823795ae2f61e6d7cbbbc91c4f485ddeceb3
CRs-Fixed: 2838113

core/hdd/src/wlan_hdd_sap_cond_chan_switch.c

@@ -56,23 +56,25 @@ static int wlan_hdd_set_pre_cac_status(struct hdd_adapter *pre_cac_adapter,
 }
 
 /**
- * wlan_hdd_set_chan_before_pre_cac() - Save the channel before pre cac
+ * wlan_hdd_set_chan_freq_before_pre_cac() - Save the channel before pre cac
  * @ap_adapter: AP adapter
- * @chan_before_pre_cac: Channel
+ * @freq_before_pre_cac: Channel
  *
- * Saves the channel which the AP was beaconing on before moving to the pre
- * cac channel. If radar is detected on the pre cac channel, this saved
+ * Saves the channel frequency which the AP was beaconing on before moving to
+ * the pre cac channel. If radar is detected on the pre cac channel, this saved
  * channel will be used for AP operations.
  *
  * Return: Zero on success, non-zero on failure
  */
-static int wlan_hdd_set_chan_before_pre_cac(struct hdd_adapter *ap_adapter,
-					    uint8_t chan_before_pre_cac)
+static int
+wlan_hdd_set_chan_freq_before_pre_cac(struct hdd_adapter *ap_adapter,
+				      qdf_freq_t freq_before_pre_cac)
 {
 	QDF_STATUS ret;
+	struct sap_context *sap_ctx = WLAN_HDD_GET_SAP_CTX_PTR(ap_adapter);
 
-	ret = wlan_sap_set_chan_before_pre_cac(
-		WLAN_HDD_GET_SAP_CTX_PTR(ap_adapter), chan_before_pre_cac);
+	ret = wlan_sap_set_chan_freq_before_pre_cac(sap_ctx,
+						    freq_before_pre_cac);
 	if (QDF_IS_STATUS_ERROR(ret))
 		return -EINVAL;
 
@@ -367,11 +369,8 @@ static int __wlan_hdd_request_pre_cac(struct hdd_context *hdd_ctx,
 		goto stop_close_pre_cac_adapter;
 	}
 
-	ret = wlan_hdd_set_chan_before_pre_cac(
-			ap_adapter,
-			wlan_reg_freq_to_chan(
-			hdd_ctx->pdev,
-			hdd_ap_ctx->operating_chan_freq));
+	ret = wlan_hdd_set_chan_freq_before_pre_cac(ap_adapter,
+						    hdd_ap_ctx->operating_chan_freq);
 	if (ret != 0) {
 		hdd_err("failed to set channel before pre cac");
 		goto stop_close_pre_cac_adapter;

core/sap/inc/sap_api.h

@@ -848,16 +848,17 @@ QDF_STATUS wlan_sap_set_pre_cac_status(struct sap_context *sap_ctx,
 				       bool status);
 
 /**
- * wlan_sap_set_chan_before_pre_cac() - Save the channel before pre cac
+ * wlan_sap_set_chan_freq_before_pre_cac() - Save the channel before pre cac
  * @sap_ctx: SAP context
- * @chan_before_pre_cac: Channel before pre cac
+ * @freq_before_pre_cac: Channel frequency before pre cac
  *
- * Saves the channel that was in use before pre cac operation
+ * Saves the channel frequency that was in use before pre cac operation
  *
  * Return: QDF_STATUS
  */
-QDF_STATUS wlan_sap_set_chan_before_pre_cac(struct sap_context *sap_ctx,
-					    uint8_t chan_before_pre_cac);
+QDF_STATUS
+wlan_sap_set_chan_freq_before_pre_cac(struct sap_context *sap_ctx,
+				      qdf_freq_t freq_before_pre_cac);
 #else
 static inline QDF_STATUS
 wlan_sap_set_pre_cac_status(struct sap_context *sap_ctx, bool status)
@@ -866,8 +867,8 @@ wlan_sap_set_pre_cac_status(struct sap_context *sap_ctx, bool status)
 }
 
 static inline QDF_STATUS
-wlan_sap_set_chan_before_pre_cac(struct sap_context *sap_ctx,
-				 uint8_t chan_before_pre_cac)
+wlan_sap_set_chan_freq_before_pre_cac(struct sap_context *sap_ctx,
+				      qdf_freq_t freq_before_pre_cac)
 {
 	return QDF_STATUS_SUCCESS;
 }

core/sap/src/sap_fsm.c

@@ -1119,7 +1119,7 @@ QDF_STATUS sap_set_session_param(mac_handle_t mac_handle,
 	sapctx->sessionId = session_id;
 	sapctx->is_pre_cac_on = false;
 	sapctx->pre_cac_complete = false;
-	sapctx->chan_before_pre_cac = 0;
+	sapctx->freq_before_pre_cac = 0;
 
 	/* When SSR, SAP will restart, clear the old context,sessionId */
 	for (i = 0; i < SAP_MAX_NUM_SESSION; i++) {
@@ -3538,10 +3538,10 @@ qdf_freq_t sap_indicate_radar(struct sap_context *sap_ctx)
 	/* set the Radar Found flag in SapDfsInfo */
 	mac->sap.SapDfsInfo.sap_radar_found_status = true;
 
-	if (sap_ctx->chan_before_pre_cac) {
-		sap_info("sapdfs: set chan before pre cac %d as target chan",
-			 sap_ctx->chan_before_pre_cac);
-		return sap_ctx->chan_before_pre_cac;
+	if (sap_ctx->freq_before_pre_cac) {
+		sap_info("sapdfs: set chan freq before pre cac %d as target chan",
+			 sap_ctx->freq_before_pre_cac);
+		return sap_ctx->freq_before_pre_cac;
 	}
 
 	if (sap_ctx->vendor_acs_dfs_lte_enabled && (QDF_STATUS_SUCCESS ==

core/sap/src/sap_internal.h

@@ -221,7 +221,7 @@ struct sap_context {
 	bool vendor_acs_dfs_lte_enabled;
 	uint8_t dfs_vendor_channel;
 	uint8_t dfs_vendor_chan_bw;
-	uint8_t chan_before_pre_cac;
+	qdf_freq_t freq_before_pre_cac;
 	uint16_t beacon_tx_rate;
 	enum sap_acs_dfs_mode dfs_mode;
 	wlan_scan_requester req_id;

core/sap/src/sap_module.c

@@ -1587,15 +1587,16 @@ QDF_STATUS wlan_sap_set_pre_cac_status(struct sap_context *sap_ctx,
 	return QDF_STATUS_SUCCESS;
 }
 
-QDF_STATUS wlan_sap_set_chan_before_pre_cac(struct sap_context *sap_ctx,
-					    uint8_t chan_before_pre_cac)
+QDF_STATUS
+wlan_sap_set_chan_freq_before_pre_cac(struct sap_context *sap_ctx,
+				      qdf_freq_t freq_before_pre_cac)
 {
 	if (!sap_ctx) {
 		sap_err("Invalid SAP pointer");
 		return QDF_STATUS_E_FAULT;
 	}
 
-	sap_ctx->chan_before_pre_cac = chan_before_pre_cac;
+	sap_ctx->freq_before_pre_cac = freq_before_pre_cac;
 	return QDF_STATUS_SUCCESS;
 }
 #endif /* FEATURE_SAP_COND_CHAN_SWITCH */