qcacld-3.0: Fix 2 GHz link disconnect issue

Some buggy 2 GHz AP indicates 40 MHz in VHT OP (|PRI_CH-CCFS0| is 2), but
indicates 20 MHz in HT info, associate as 20 MHz by HT info, when handle
beacon update, try to upgrade to 40 MHz by VHT OP, sec_chan_offset
isn't filled but used, lim_is_csa_channel_allowed return false,
disconnect will happen.

To fix it, when handle beacon update, honor ht info than vht op when
conflict happens as 2G VHT not included in formal spec.
this logic existed in sch_bcn_update_opmode_change already, so remove
it from lim_process_beacon_eht.

Use CCFS0 instead of sec_chan_offset in csa param to calculate
sec_ch_2g_freq in lim_is_csa_channel_allowed.

Change-Id: Ic7e66b040f4234157237a2f3cb449ccaf202823e
CRs-Fixed: 3627496

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

@@ -385,14 +385,6 @@ void lim_process_beacon_eht_op(struct pe_session *session,
 				return;
 			}
 		}
-	} else if (he_op->vht_oper_present) {
-		ch_width = he_op->vht_oper.info.chan_width;
-		ccfs0 = he_op->vht_oper.info.center_freq_seg0;
-		ccfs1 = he_op->vht_oper.info.center_freq_seg1;
-		ori_bw = wlan_mlme_convert_vht_op_bw_to_phy_ch_width(ch_width,
-								     chan_id,
-								     ccfs0,
-								     ccfs1);
 	} else if (he_op->oper_info_6g_present) {
 		ch_width = he_op->oper_info_6g.info.ch_width;
 		ccfs0 = he_op->oper_info_6g.info.center_freq_seg0;
@@ -401,16 +393,7 @@ void lim_process_beacon_eht_op(struct pe_session *session,
 									 chan_id,
 									 ccfs0,
 									 ccfs1);
-	} else if (bcn_ptr->VHTOperation.present) {
-		ch_width = bcn_ptr->VHTOperation.chanWidth;
-		ccfs0 = bcn_ptr->VHTOperation.chan_center_freq_seg0;
-		ccfs1 = bcn_ptr->VHTOperation.chan_center_freq_seg1;
-		ori_bw = wlan_mlme_convert_vht_op_bw_to_phy_ch_width(ch_width,
-								     chan_id,
-								     ccfs0,
-								     ccfs1);
 	} else {
-		pe_err("Invalid operation");
 		return;
 	}
 

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

@@ -1786,9 +1786,9 @@ static bool lim_is_csa_channel_allowed(struct mac_context *mac_ctx,
 
 	if (WLAN_REG_IS_24GHZ_CH_FREQ(csa_freq) &&
 	    wlan_reg_get_bw_value(new_ch_width) > 20) {
-		if (csa_params->sec_chan_offset == PHY_DOUBLE_CHANNEL_LOW_PRIMARY)
+		if (csa_params->new_ch_freq_seg1 == csa_params->channel + 2)
 			sec_ch_2g_freq = csa_freq + HT40_SEC_OFFSET;
-		else if (csa_params->sec_chan_offset == PHY_DOUBLE_CHANNEL_HIGH_PRIMARY)
+		else if (csa_params->new_ch_freq_seg1 == csa_params->channel - 2)
 			sec_ch_2g_freq = csa_freq - HT40_SEC_OFFSET;
 	}
 
@@ -1799,8 +1799,9 @@ static bool lim_is_csa_channel_allowed(struct mac_context *mac_ctx,
 						REG_CURRENT_PWR_MODE);
 	if (chan_state == CHANNEL_STATE_INVALID ||
 	    chan_state == CHANNEL_STATE_DISABLE) {
-		pe_err("Invalid csa_freq:%d for provided ch_width:%d. Disconnect",
-		       csa_freq, new_ch_width);
+		pe_err("Invalid csa_freq %d ch_width %d ccfs0 %d ccfs1 %d sec_ch %d. Disconnect",
+		       csa_freq, new_ch_width, csa_params->new_ch_freq_seg1,
+		       csa_params->new_ch_freq_seg2, sec_ch_2g_freq);
 		lim_tear_down_link_with_ap(mac_ctx,
 					   session_entry->peSessionId,
 					   REASON_CHANNEL_SWITCH_FAILED,