qcacld-3.0: Ignore CSA if bandwidth, channel, puncture bitmap unchanged

Currently if STA with country set to KR tries
to connect to an AP operating in 6 GHz band in
320 MHz bandwidth, connection happens in 160 MHz.
After connection if host receives SET_FCC_CHANNEL 0
command it disables all 6 GHz channels and keeps
in-use bonded channels enabled.
While processing connected AP's beacon as AP
advertised bandwidth 320 MHz is greater than
connection bandwidth 160 MHz, STA tries to follow
AP advertised bandwidth. As host validates
AP advertised bandwidth, it finds some of the
bonded channels are disabled hence tears down
the connection.

To address this issue ignore CSA if AP advertised
channel is same as the connection channel and
there is no change in puncture bitmap for the
given CSA params and best bandwidth supported by
regulatory for the given CSA params is same as the
connection bandwidth.

Change-Id: I5e376cfaf798a228b4c1db45770fc0108d54052a
CRs-Fixed: 3622068

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

@@ -1941,6 +1941,29 @@ static void update_csa_link_info(struct wlan_objmgr_vdev *vdev,
 
 #endif
 
+/**
+ * lim_sta_follow_csa() - Check if STA needs to follow CSA
+ * @session_entry: Session pointer
+ * @csa_params: Pointer to CSA params
+ * @lim_ch_switch: Pointer to lim channel switch info
+ * @ch_params: Channel params
+ *
+ * Return: True if CSA is required, else return false.
+ */
+static bool lim_sta_follow_csa(struct pe_session *session_entry,
+			       struct csa_offload_params *csa_params,
+			       tLimChannelSwitchInfo *lim_ch_switch,
+			       struct ch_params ch_params)
+{
+	if (session_entry->curr_op_freq == csa_params->csa_chan_freq &&
+	    session_entry->ch_width == ch_params.ch_width &&
+	    lim_is_puncture_same(lim_ch_switch, session_entry)) {
+		pe_debug("Ignore CSA, no change in ch, bw and puncture");
+		return false;
+	}
+	return true;
+}
+
 void lim_handle_sta_csa_param(struct mac_context *mac_ctx,
 			      struct csa_offload_params *csa_params)
 {
@@ -1982,6 +2005,26 @@ void lim_handle_sta_csa_param(struct mac_context *mac_ctx,
 		goto err;
 	}
 
+	lim_ch_switch = &session_entry->gLimChannelSwitch;
+	ch_params.ch_width = csa_params->new_ch_width;
+
+	if (IS_DOT11_MODE_EHT(session_entry->dot11mode))
+		lim_set_csa_chan_param_11be(session_entry, csa_params,
+					    &ch_params);
+	else
+		wlan_reg_set_channel_params_for_pwrmode(
+					     mac_ctx->pdev,
+					     csa_params->csa_chan_freq,
+					     0, &ch_params,
+					     REG_CURRENT_PWR_MODE);
+	lim_set_chan_sw_puncture(lim_ch_switch, &ch_params);
+
+	if (!lim_sta_follow_csa(session_entry, csa_params,
+				lim_ch_switch, ch_params))
+		goto err;
+	else
+		qdf_mem_zero(&ch_params, sizeof(struct ch_params));
+
 	if (!lim_is_csa_channel_allowed(mac_ctx, session_entry,
 					session_entry->curr_op_freq,
 					csa_params)) {
@@ -1996,7 +2039,6 @@ void lim_handle_sta_csa_param(struct mac_context *mac_ctx,
 	lim_update_tdls_set_state_for_fw(session_entry, false);
 	lim_delete_tdls_peers(mac_ctx, session_entry);
 
-	lim_ch_switch = &session_entry->gLimChannelSwitch;
 	lim_ch_switch->switchMode = csa_params->switch_mode;
 	/* timer already started by firmware, switch immediately */
 	lim_ch_switch->switchCount = 0;
@@ -2240,13 +2282,9 @@ void lim_handle_sta_csa_param(struct mac_context *mac_ctx,
 		 lim_ch_switch->sec_ch_offset, session_entry->curr_op_freq,
 		 session_entry->ch_width);
 
-	if (session_entry->curr_op_freq == csa_params->csa_chan_freq &&
-	    session_entry->ch_width == lim_ch_switch->ch_width &&
-	    lim_is_puncture_same(lim_ch_switch, session_entry)) {
-		pe_debug("Ignore CSA, no change in ch, bw and puncture");
-		wlan_mlme_send_csa_event_status_ind(session_entry->vdev, 0);
+	if (!lim_sta_follow_csa(session_entry, csa_params,
+				lim_ch_switch, ch_params))
 		goto err;
-	}
 
 	if (!wlan_cm_is_vdev_connected(session_entry->vdev)) {
 		pe_info_rl("Ignore CSA, vdev is in not in conncted state");