qcacld-3.0: Use AP channel width to fill OMN IE in assoc request

Currently the pe_session->ch_width is overwritten to maximum
channel width if the AP advertises 20 MHz ch_width, to mitigate
some interopebality issues with faulty AP that changes BW during
association. So save the AP channel width computed in
pe_session->ap_ch_width.

Use the pe_session->ap_ch_width to validate if the ch_width is
20 MHz to fill the IE.

Change-Id: Iafe60f8497fde946f0135a6586e524143f3902f5
CRs-Fixed: 3548484

core/mac/src/pe/include/lim_session.h

@@ -506,7 +506,8 @@ struct wlan_mlo_ie_info {
  * @gLimOperatingMode:
  * @vhtCapabilityPresentInBeacon:
  * @ch_center_freq_seg0: center freq number as advertised OTA
- * @ch_width:
+ * @ch_width:    Session max channel width
+ * @ap_ch_width: AP advertised channel width
  * @puncture_bitmap:
  * @ch_center_freq_seg1:
  * @enableVhtpAid:
@@ -817,6 +818,7 @@ struct pe_session {
 	uint8_t vhtCapabilityPresentInBeacon;
 	uint8_t ch_center_freq_seg0;
 	enum phy_ch_width ch_width;
+	enum phy_ch_width ap_ch_width;
 #ifdef WLAN_FEATURE_11BE
 	uint16_t puncture_bitmap;
 #endif

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

@@ -3265,6 +3265,7 @@ lim_fill_pe_session(struct mac_context *mac_ctx, struct pe_session *session,
 		session->ch_center_freq_seg0 = 0;
 		session->ch_width = CH_WIDTH_20MHZ;
 	}
+	session->ap_ch_width = session->ch_width;
 
 	if (IS_DOT11_MODE_HE(session->dot11mode)) {
 		lim_update_session_he_capable(mac_ctx, session);

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

@@ -781,6 +781,7 @@ void lim_extract_ap_capability(struct mac_context *mac_ctx, uint8_t *p_ie,
 			session->ch_center_freq_seg1 = 0;
 		}
 		session->ch_width = vht_ch_wd + 1;
+		session->ap_ch_width = session->ch_width;
 	}
 
 	if (session->vhtCapability &&

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

@@ -2580,7 +2580,7 @@ lim_send_assoc_req_mgmt_frame(struct mac_context *mac_ctx,
 		populate_dot11f_vht_caps(mac_ctx, pe_session, &frm->VHTCaps);
 		vht_enabled = true;
 		if (pe_session->gLimOperatingMode.present &&
-		    pe_session->ch_width == CH_WIDTH_20MHZ &&
+		    pe_session->ap_ch_width == CH_WIDTH_20MHZ &&
 		    frm->VHTCaps.present &&
 		    !IS_DOT11_MODE_HE(pe_session->dot11mode)) {
 			populate_dot11f_operating_mode(mac_ctx,