qcacld-3.0: Update CAC duration before chan switch

For ETSI, CAC duration is different between DFS and weather channel.

Update cac_duration_ms and dfs_regdomain in sap_ctx before
switch to new channel, to avoid DFS CAC duration used for
weather channel, or vice versa.

Change-Id: Ie83779b9948bdd3bd212994c2438257793a9e347
CRs-Fixed: 2995526

core/sap/src/sap_api_link_cntl.c

@@ -593,9 +593,6 @@ wlansap_roam_process_dfs_chansw_update(mac_handle_t mac_handle,
 	    policy_mgr_is_current_hwmode_dbs(mac_ctx->psoc) ||
 	    sap_ctx->csa_reason == CSA_REASON_DCS ||
 	    !sap_scc_dfs) {
-		sap_get_cac_dur_dfs_region(sap_ctx,
-			&sap_ctx->csr_roamProfile.cac_duration_ms,
-			&sap_ctx->csr_roamProfile.dfs_regdomain);
 		/*
 		 * Most likely, radar has been detected and SAP wants to
 		 * change the channel
@@ -641,9 +638,6 @@ wlansap_roam_process_dfs_chansw_update(mac_handle_t mac_handle,
 		sap_context = mac_ctx->sap.sapCtxList[intf].sap_context;
 		sap_debug("sapdfs:issue chnl change for sapctx[%pK]",
 			  sap_context);
-		sap_get_cac_dur_dfs_region(sap_context,
-			&sap_context->csr_roamProfile.cac_duration_ms,
-			&sap_context->csr_roamProfile.dfs_regdomain);
 		/*
 		 * Most likely, radar has been detected and SAP wants to
 		 * change the channel

core/sap/src/sap_module.c

@@ -1791,6 +1791,14 @@ wlansap_set_cac_required_for_chan(struct mac_context *mac_ctx,
 		}
 	}
 
+	/* 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);
 }