qcacld-3.0: Update CAC duration of new channel to vdev before CSA

CAC duration of new channel should be able to get before CSA. During
CSA, CAC duration of new channel is used to populate max channel
switch IE.

Change-Id: I25d430d3eb663c90555ebad7a214b0789ea8c1ce
CRs-Fixed: 3102581

core/mac/inc/sir_api.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2012-2021 The Linux Foundation. All rights reserved.
- * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -2369,6 +2369,7 @@ typedef struct sSirDfsCsaIeRequest {
 	uint8_t  ch_switch_beacon_cnt;
 	uint8_t  ch_switch_mode;
 	uint8_t  dfs_ch_switch_disable;
+	uint32_t new_chan_cac_ms;
 } tSirDfsCsaIeRequest, *tpSirDfsCsaIeRequest;
 
 /* Indication from lower layer indicating the completion of first beacon send

core/mac/src/pe/lim/lim_process_sme_req_messages.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2012-2021 The Linux Foundation. All rights reserved.
- * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -66,6 +66,7 @@
 #include "wlan_lmac_if_def.h"
 #include "wlan_reg_services_api.h"
 #include <lim_mlo.h>
+#include <wlan_vdev_mgr_utils_api.h>
 
 /* SME REQ processing function templates */
 static bool __lim_process_sme_sys_ready_ind(struct mac_context *, uint32_t *);
@@ -8693,6 +8694,9 @@ skip_vht:
 				      MAX_WAKELOCK_FOR_CSA);
 	qdf_runtime_pm_prevent_suspend(&session_entry->ap_ecsa_runtime_lock);
 
+	session_entry->cac_duration_ms = dfs_csa_ie_req->new_chan_cac_ms;
+	wlan_util_vdev_mgr_set_cac_timeout_for_vdev(
+		session_entry->vdev, dfs_csa_ie_req->new_chan_cac_ms);
 	/* Send CSA IE request from here */
 	lim_send_dfs_chan_sw_ie_update(mac_ctx, session_entry);
 

core/mac/src/pe/lim/lim_utils.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2011-2021 The Linux Foundation. All rights reserved.
- * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -78,6 +78,7 @@
 #endif
 #include "wlan_cmn_ieee80211.h"
 #include <wlan_cm_api.h>
+#include <wlan_vdev_mgr_utils_api.h>
 
 /** -------------------------------------------------------------
    \fn lim_delete_dialogue_token_list
@@ -9851,7 +9852,8 @@ QDF_STATUS lim_pre_vdev_start(struct mac_context *mac,
 				session->beaconParams.beaconInterval;
 	if (mlme_obj->mgmt.generic.type == WLAN_VDEV_MLME_TYPE_AP) {
 		mlme_obj->mgmt.ap.hidden_ssid = session->ssidHidden;
-		mlme_obj->mgmt.ap.cac_duration_ms = session->cac_duration_ms;
+		wlan_util_vdev_mgr_set_cac_timeout_for_vdev(
+				mlme_obj->vdev, session->cac_duration_ms);
 	}
 	mlme_obj->proto.generic.dtim_period = session->dtimPeriod;
 	mlme_obj->proto.generic.slot_time = session->shortSlotTimeSupported;

core/sap/inc/sap_api.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2012-2021 The Linux Foundation. All rights reserved.
- * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -1463,6 +1463,8 @@ QDF_STATUS wlansap_release_vdev_ref(struct sap_context *sap_ctx);
  * @sap_ctxt: sap context
  * @cac_duration_ms: pointer to cac duration
  * @dfs_region: pointer to dfs region
+ * @chan_freq: channel frequency
+ * @ch_params: pointer to ch_params
  *
  * Get cac duration and dfs region.
  *
@@ -1470,7 +1472,9 @@ QDF_STATUS wlansap_release_vdev_ref(struct sap_context *sap_ctx);
  */
 void sap_get_cac_dur_dfs_region(struct sap_context *sap_ctx,
 				uint32_t *cac_duration_ms,
-				uint32_t *dfs_region);
+				uint32_t *dfs_region,
+				qdf_freq_t chan_freq,
+				struct ch_params *ch_params);
 
 /**
  * sap_clear_global_dfs_param() - Reset global dfs param of sap ctx

core/sap/src/sap_fsm.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2012-2021 The Linux Foundation. All rights reserved.
- * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved
+ * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -58,6 +58,7 @@
 #include "wlan_mlme_ucfg_api.h"
 #include "wlan_policy_mgr_ucfg.h"
 #include "cfg_ucfg_api.h"
+#include "wlan_mlme_vdev_mgr_interface.h"
 
 /*----------------------------------------------------------------------------
  * Preprocessor Definitions and Constants
@@ -282,20 +283,24 @@ static uint8_t sap_random_channel_sel(struct sap_context *sap_ctx)
 /**
  * sap_is_channel_bonding_etsi_weather_channel() - check weather chan bonding.
  * @sap_ctx: sap context.
+ * @chan_freq: chan frequency
+ * @ch_params: pointer to ch_params
  *
- * Check if the current SAP operating channel is bonded to weather radar
+ * Check if given channel and channel params are bonded to weather radar
  * channel in ETSI domain.
  *
  * Return: True if bonded to weather channel in ETSI
  */
 static bool
-sap_is_channel_bonding_etsi_weather_channel(struct sap_context *sap_ctx)
+sap_is_channel_bonding_etsi_weather_channel(struct sap_context *sap_ctx,
+					    qdf_freq_t chan_freq,
+					    struct ch_params *ch_params)
 {
 	struct wlan_objmgr_pdev *pdev = wlan_vdev_get_pdev(sap_ctx->vdev);
 
 	if (IS_CH_BONDING_WITH_WEATHER_CH(wlan_reg_freq_to_chan(pdev,
-								sap_ctx->chan_freq)) &&
-	    sap_ctx->ch_params.ch_width != CH_WIDTH_20MHZ)
+								chan_freq)) &&
+	    ch_params->ch_width != CH_WIDTH_20MHZ)
 		return true;
 
 	return false;
@@ -468,16 +473,93 @@ bool sap_operating_on_dfs(struct mac_context *mac_ctx,
 	return false;
 }
 
+/**
+ * is_wlansap_cac_required_for_chan() - Is cac required for given channel
+ * @mac_ctx: mac ctx
+ * @sap_ctx: sap context
+ * @chan_freq: given channel
+ * @ch_params: pointer to ch_params
+ *
+ * Return: True if cac is required for given channel
+ */
+static bool
+is_wlansap_cac_required_for_chan(struct mac_context *mac_ctx,
+				 struct sap_context *sap_ctx,
+				 qdf_freq_t chan_freq,
+				 struct ch_params *ch_params)
+{
+	bool is_ch_dfs = false;
+	bool cac_required;
+	uint8_t vdev_id_list[MAX_NUMBER_OF_CONC_CONNECTIONS];
+	uint32_t freq_list[MAX_NUMBER_OF_CONC_CONNECTIONS];
+	uint8_t sta_cnt, i;
+
+	if (ch_params->ch_width == CH_WIDTH_160MHZ) {
+		is_ch_dfs = true;
+	} else if (ch_params->ch_width == CH_WIDTH_80P80MHZ) {
+		if (wlan_reg_get_channel_state_for_freq(
+						mac_ctx->pdev,
+						chan_freq) ==
+		    CHANNEL_STATE_DFS ||
+		    wlan_reg_get_channel_state_for_freq(
+					mac_ctx->pdev,
+					ch_params->mhz_freq_seg1) ==
+				CHANNEL_STATE_DFS)
+			is_ch_dfs = true;
+	} else {
+		if (wlan_reg_get_channel_state_for_freq(
+						mac_ctx->pdev,
+						chan_freq) ==
+		    CHANNEL_STATE_DFS)
+			is_ch_dfs = true;
+	}
+	if (WLAN_REG_IS_6GHZ_CHAN_FREQ(chan_freq))
+		is_ch_dfs = false;
+
+	sap_debug("vdev id %d chan %d is_ch_dfs %d pre_cac_complete %d ignore_cac %d cac_state %d",
+		  sap_ctx->sessionId, chan_freq, is_ch_dfs,
+		  sap_ctx->pre_cac_complete, mac_ctx->sap.SapDfsInfo.ignore_cac,
+		  mac_ctx->sap.SapDfsInfo.cac_state);
+
+	if (!is_ch_dfs || sap_ctx->pre_cac_complete ||
+	    mac_ctx->sap.SapDfsInfo.ignore_cac ||
+	    mac_ctx->sap.SapDfsInfo.cac_state == eSAP_DFS_SKIP_CAC)
+		cac_required = false;
+	else
+		cac_required = true;
+
+	if (cac_required) {
+		sta_cnt =
+		  policy_mgr_get_mode_specific_conn_info(mac_ctx->psoc,
+							 freq_list,
+							 vdev_id_list,
+							 PM_STA_MODE);
+
+		for (i = 0; i < sta_cnt; i++) {
+			if (chan_freq == freq_list[i]) {
+				sap_debug("STA vdev id %d exists, ignore CAC",
+					  vdev_id_list[i]);
+				cac_required = false;
+			}
+		}
+	}
+
+	return cac_required;
+}
+
 void sap_get_cac_dur_dfs_region(struct sap_context *sap_ctx,
-		uint32_t *cac_duration_ms,
-		uint32_t *dfs_region)
+				uint32_t *cac_duration_ms,
+				uint32_t *dfs_region,
+				qdf_freq_t chan_freq,
+				struct ch_params *ch_params)
 {
 	int i;
 	qdf_freq_t freq_list[MAX_BONDED_CHANNELS];
 	uint8_t num_freq;
-	struct ch_params *ch_params = &sap_ctx->ch_params;
 	struct mac_context *mac;
+	bool cac_required;
 
+	*cac_duration_ms = 0;
 	if (!sap_ctx) {
 		sap_err("null sap_ctx");
 		return;
@@ -490,9 +572,11 @@ void sap_get_cac_dur_dfs_region(struct sap_context *sap_ctx,
 	}
 
 	wlan_reg_get_dfs_region(mac->pdev, dfs_region);
-	if (mac->sap.SapDfsInfo.ignore_cac) {
-		*cac_duration_ms = 0;
-		sap_debug("ignore_cac is set");
+	cac_required = is_wlansap_cac_required_for_chan(mac, sap_ctx,
+							chan_freq, ch_params);
+
+	if (!cac_required) {
+		sap_debug("cac is not required");
 		return;
 	}
 	*cac_duration_ms = DEFAULT_CAC_TIMEOUT;
@@ -502,7 +586,8 @@ void sap_get_cac_dur_dfs_region(struct sap_context *sap_ctx,
 		return;
 	}
 
-	if (sap_is_channel_bonding_etsi_weather_channel(sap_ctx)) {
+	if (sap_is_channel_bonding_etsi_weather_channel(sap_ctx, chan_freq,
+							ch_params)) {
 		*cac_duration_ms = ETSI_WEATHER_CH_CAC_TIMEOUT;
 		sap_debug("sapdfs: bonding_etsi_weather_channel");
 		return;
@@ -2844,7 +2929,11 @@ static QDF_STATUS sap_goto_starting(struct sap_context *sap_ctx,
 	sap_ctx->csr_roamProfile.ch_params = sap_ctx->ch_params;
 	sap_get_cac_dur_dfs_region(sap_ctx,
 				   &sap_ctx->csr_roamProfile.cac_duration_ms,
-				   &sap_ctx->csr_roamProfile.dfs_regdomain);
+				   &sap_ctx->csr_roamProfile.dfs_regdomain,
+				   sap_ctx->chan_freq,
+				   &sap_ctx->ch_params);
+	mlme_set_cac_required(sap_ctx->vdev,
+			      !!sap_ctx->csr_roamProfile.cac_duration_ms);
 	sap_ctx->csr_roamProfile.beacon_tx_rate =
 			sap_ctx->beacon_tx_rate;
 	sap_debug("notify hostapd about chan freq selection: %d",
@@ -4301,7 +4390,8 @@ static int sap_start_dfs_cac_timer(struct sap_context *sap_ctx)
 		return 1;
 	}
 
-	sap_get_cac_dur_dfs_region(sap_ctx, &cac_dur, &dfs_region);
+	sap_get_cac_dur_dfs_region(sap_ctx, &cac_dur, &dfs_region,
+				   sap_ctx->chan_freq, &sap_ctx->ch_params);
 	if (0 == cac_dur)
 		return 0;
 

core/sap/src/sap_module.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2012-2021 The Linux Foundation. All rights reserved.
- * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -1746,79 +1746,6 @@ void wlansap_get_sec_channel(uint8_t sec_ch_offset,
 	}
 }
 
-static void
-wlansap_set_cac_required_for_chan(struct mac_context *mac_ctx,
-				  struct sap_context *sap_ctx)
-{
-	bool is_ch_dfs = false;
-	bool cac_required;
-	uint32_t chan_freq;
-	uint8_t vdev_id_list[MAX_NUMBER_OF_CONC_CONNECTIONS];
-	uint32_t freq_list[MAX_NUMBER_OF_CONC_CONNECTIONS];
-	uint8_t sta_cnt, i;
-
-	chan_freq = sap_ctx->chan_freq;
-	if (sap_ctx->ch_params.ch_width == CH_WIDTH_160MHZ) {
-		is_ch_dfs = true;
-	} else if (sap_ctx->ch_params.ch_width == CH_WIDTH_80P80MHZ) {
-		if (wlan_reg_get_channel_state_for_freq(
-						mac_ctx->pdev,
-						sap_ctx->chan_freq) ==
-		    CHANNEL_STATE_DFS ||
-		    wlan_reg_get_channel_state_for_freq(
-					mac_ctx->pdev,
-					sap_ctx->ch_params.mhz_freq_seg1) ==
-				CHANNEL_STATE_DFS)
-			is_ch_dfs = true;
-	} else {
-		if (wlan_reg_get_channel_state_for_freq(
-						mac_ctx->pdev,
-						sap_ctx->chan_freq) ==
-		    CHANNEL_STATE_DFS)
-			is_ch_dfs = true;
-	}
-	if (WLAN_REG_IS_6GHZ_CHAN_FREQ(sap_ctx->chan_freq))
-		is_ch_dfs = false;
-
-	sap_debug("vdev id %d chan %d is_ch_dfs %d pre_cac_complete %d ignore_cac %d cac_state %d",
-		  sap_ctx->sessionId, chan_freq, is_ch_dfs,
-		  sap_ctx->pre_cac_complete, mac_ctx->sap.SapDfsInfo.ignore_cac,
-		  mac_ctx->sap.SapDfsInfo.cac_state);
-
-	if (!is_ch_dfs || sap_ctx->pre_cac_complete ||
-	    mac_ctx->sap.SapDfsInfo.ignore_cac ||
-	    (mac_ctx->sap.SapDfsInfo.cac_state == eSAP_DFS_SKIP_CAC))
-		cac_required = false;
-	else
-		cac_required = true;
-
-	if (cac_required) {
-		sta_cnt =
-		  policy_mgr_get_mode_specific_conn_info(mac_ctx->psoc,
-							 freq_list,
-							 vdev_id_list,
-							 PM_STA_MODE);
-
-		for (i = 0; i < sta_cnt; i++) {
-			if (sap_ctx->chan_freq == freq_list[i]) {
-				sap_debug("STA vdev id %d exists, ignore CAC",
-					  vdev_id_list[i]);
-				cac_required = false;
-			}
-		}
-	}
-
-	/* Update cac_duration_ms & dfs_region in sap_ctx for new channel,
-	 * no matter CAC required or not.
-	 * For ETSI, CAC duration is different between DFS and weather channel.
-	 */
-	sap_get_cac_dur_dfs_region(sap_ctx,
-				   &sap_ctx->csr_roamProfile.cac_duration_ms,
-				   &sap_ctx->csr_roamProfile.dfs_regdomain);
-
-	mlme_set_cac_required(sap_ctx->vdev, cac_required);
-}
-
 QDF_STATUS wlansap_channel_change_request(struct sap_context *sap_ctx,
 					  uint32_t target_chan_freq)
 {
@@ -1881,7 +1808,13 @@ QDF_STATUS wlansap_channel_change_request(struct sap_context *sap_ctx,
 				&sap_ctx->sec_ch_freq);
 	sap_ctx->csr_roamProfile.ch_params = *ch_params;
 	sap_dfs_set_current_channel(sap_ctx);
-	wlansap_set_cac_required_for_chan(mac_ctx, sap_ctx);
+
+	sap_get_cac_dur_dfs_region(sap_ctx,
+				   &sap_ctx->csr_roamProfile.cac_duration_ms,
+				   &sap_ctx->csr_roamProfile.dfs_regdomain,
+				   sap_ctx->chan_freq, &sap_ctx->ch_params);
+	mlme_set_cac_required(sap_ctx->vdev,
+			      !!sap_ctx->csr_roamProfile.cac_duration_ms);
 
 	status = sme_roam_channel_change_req(MAC_HANDLE(mac_ctx),
 					     sap_ctx->bssid,
@@ -1930,6 +1863,8 @@ QDF_STATUS wlansap_start_beacon_req(struct sap_context *sap_ctx)
 QDF_STATUS wlansap_dfs_send_csa_ie_request(struct sap_context *sap_ctx)
 {
 	struct mac_context *mac;
+	uint32_t new_cac_ms;
+	uint32_t dfs_region;
 
 	if (!sap_ctx) {
 		sap_err("Invalid SAP pointer");
@@ -1948,17 +1883,23 @@ QDF_STATUS wlansap_dfs_send_csa_ie_request(struct sap_context *sap_ctx)
 			mac->sap.SapDfsInfo.target_chan_freq,
 			0, &mac->sap.SapDfsInfo.new_ch_params);
 
-	sap_debug("chan freq:%d req:%d width:%d off:%d",
+	sap_get_cac_dur_dfs_region(sap_ctx, &new_cac_ms, &dfs_region,
+				   mac->sap.SapDfsInfo.target_chan_freq,
+				   &mac->sap.SapDfsInfo.new_ch_params);
+	mlme_set_cac_required(sap_ctx->vdev, !!new_cac_ms);
+	sap_debug("chan freq:%d req:%d width:%d off:%d cac %d",
 		  mac->sap.SapDfsInfo.target_chan_freq,
 		  mac->sap.SapDfsInfo.csaIERequired,
 		  mac->sap.SapDfsInfo.new_ch_params.ch_width,
-		  mac->sap.SapDfsInfo.new_ch_params.sec_ch_offset);
+		  mac->sap.SapDfsInfo.new_ch_params.sec_ch_offset,
+		  new_cac_ms);
 
 	return sme_roam_csa_ie_request(MAC_HANDLE(mac),
 				       sap_ctx->bssid,
 				       mac->sap.SapDfsInfo.target_chan_freq,
 				       mac->sap.SapDfsInfo.csaIERequired,
-				       &mac->sap.SapDfsInfo.new_ch_params);
+				       &mac->sap.SapDfsInfo.new_ch_params,
+				       new_cac_ms);
 }
 
 QDF_STATUS wlansap_get_dfs_ignore_cac(mac_handle_t mac_handle,

core/sme/inc/csr_internal.h

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2011-2021 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -582,11 +583,27 @@ QDF_STATUS csr_roam_channel_change_req(struct mac_context *mac,
 QDF_STATUS csr_roam_start_beacon_req(struct mac_context *mac,
 		struct qdf_mac_addr bssid, uint8_t dfsCacWaitStatus);
 
+/**
+ * csr_roam_send_chan_sw_ie_request() - Request to transmit CSA IE
+ * @mac_ctx:        Global MAC context
+ * @bssid:          BSSID
+ * @target_chan_freq: Channel frequency on which to send the IE
+ * @csa_ie_reqd:    Include/Exclude CSA IE.
+ * @ch_params:  operating Channel related information
+ * @new_cac_ms: cac duration of new channel
+ *
+ * This function sends request to transmit channel switch announcement
+ * IE to lower layers
+ *
+ * Return: success or failure
+ **/
 QDF_STATUS csr_roam_send_chan_sw_ie_request(struct mac_context *mac,
 					    struct qdf_mac_addr bssid,
 					    uint32_t target_chan_freq,
 					    uint8_t csaIeReqd,
-					    struct ch_params *ch_params);
+					    struct ch_params *ch_params,
+					    uint32_t new_cac_ms);
+
 QDF_STATUS csr_roam_modify_add_ies(struct mac_context *mac,
 					tSirModifyIE *pModifyIE,
 				   eUpdateIEsType updateType);

core/sme/inc/sme_api.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2012-2021 The Linux Foundation. All rights reserved.
- * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -1305,6 +1305,8 @@ QDF_STATUS sme_roam_start_beacon_req(mac_handle_t mac_handle,
 				     struct qdf_mac_addr bssid,
 				     uint8_t dfsCacWaitStatus);
 
+QDF_STATUS sme_csa_restart(struct mac_context *mac_ctx, uint8_t session_id);
+
 /**
  * sme_roam_csa_ie_request() - request CSA IE transmission from PE
  * @mac_handle: handle returned by mac_open
@@ -1312,15 +1314,15 @@ QDF_STATUS sme_roam_start_beacon_req(mac_handle_t mac_handle,
  * @target_chan_freq: target channel frequency information
  * @csaIeReqd: CSA IE Request
  * @ch_params: channel information
+ * @new_cac_ms: cac duration of new channel
  *
  * Return: QDF_STATUS
  */
-QDF_STATUS sme_csa_restart(struct mac_context *mac_ctx, uint8_t session_id);
-
 QDF_STATUS sme_roam_csa_ie_request(mac_handle_t mac_handle,
 				   struct qdf_mac_addr bssid,
 				   uint32_t target_chan_freq, uint8_t csaIeReqd,
-				   struct ch_params *ch_params);
+				   struct ch_params *ch_params,
+				   uint32_t new_cac_ms);
 
 /**
  * sme_set_addba_accept() - Allow/Reject the ADDBA req session

core/sme/src/common/sme_api.c

@@ -8571,7 +8571,8 @@ QDF_STATUS sme_csa_restart(struct mac_context *mac_ctx, uint8_t session_id)
 QDF_STATUS sme_roam_csa_ie_request(mac_handle_t mac_handle,
 				   struct qdf_mac_addr bssid,
 				   uint32_t target_chan_freq, uint8_t csaIeReqd,
-				   struct ch_params *ch_params)
+				   struct ch_params *ch_params,
+				   uint32_t new_cac_ms)
 {
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 	struct mac_context *mac = MAC_CONTEXT(mac_handle);
@@ -8579,7 +8580,9 @@ QDF_STATUS sme_roam_csa_ie_request(mac_handle_t mac_handle,
 	status = sme_acquire_global_lock(&mac->sme);
 	if (QDF_IS_STATUS_SUCCESS(status)) {
 		status = csr_roam_send_chan_sw_ie_request(mac, bssid,
-				target_chan_freq, csaIeReqd, ch_params);
+							  target_chan_freq,
+							  csaIeReqd, ch_params,
+							  new_cac_ms);
 		sme_release_global_lock(&mac->sme);
 	}
 	return status;

core/sme/src/csr/csr_api_roam.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2012-2021 The Linux Foundation. All rights reserved.
- * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -8228,24 +8228,12 @@ QDF_STATUS csr_csa_restart(struct mac_context *mac_ctx, uint8_t session_id)
 	return status;
 }
 
-/**
- * csr_roam_send_chan_sw_ie_request() - Request to transmit CSA IE
- * @mac_ctx:        Global MAC context
- * @bssid:          BSSID
- * @target_chan_freq: Channel frequency on which to send the IE
- * @csa_ie_reqd:    Include/Exclude CSA IE.
- * @ch_params:  operating Channel related information
- *
- * This function sends request to transmit channel switch announcement
- * IE to lower layers
- *
- * Return: success or failure
- **/
 QDF_STATUS csr_roam_send_chan_sw_ie_request(struct mac_context *mac_ctx,
 					    struct qdf_mac_addr bssid,
 					    uint32_t target_chan_freq,
 					    uint8_t csa_ie_reqd,
-					    struct ch_params *ch_params)
+					    struct ch_params *ch_params,
+					    uint32_t new_cac_ms)
 {
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	tSirDfsCsaIeRequest *msg;
@@ -8264,6 +8252,7 @@ QDF_STATUS csr_roam_send_chan_sw_ie_request(struct mac_context *mac_ctx,
 	msg->ch_switch_mode = mac_ctx->sap.SapDfsInfo.sap_ch_switch_mode;
 	msg->dfs_ch_switch_disable =
 		mac_ctx->sap.SapDfsInfo.disable_dfs_ch_switch;
+	msg->new_chan_cac_ms = new_cac_ms;
 	qdf_mem_copy(msg->bssid, bssid.bytes, QDF_MAC_ADDR_SIZE);
 	qdf_mem_copy(&msg->ch_params, ch_params, sizeof(struct ch_params));