qcacld-3.0: Use current oper ch_width to fill EHT_OPER IE

Currently, session->ch_width is used to send the current operating
ch_width of the SAP in beacons/probe rsp/assoc rsp. But the
current operating bw may change due to concurrencies. Refine the
current usage to get operating ch_width from vdev mlme priv object
instead of pe_session.

Change-Id: Ie4be6337fcb1902f38ae5cb2db03c5b6af16ee3a
CRs-Fixed: 3600239

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

@@ -11067,6 +11067,14 @@ QDF_STATUS lim_pre_vdev_start(struct mac_context *mac,
 							&ch_params,
 							REG_CURRENT_PWR_MODE);
 		lim_update_ap_he_op(session, &ch_params);
+
+		wlan_mlme_set_ap_oper_ch_width(session->vdev,
+					       session->ch_width);
+		if (session->ch_width == CH_WIDTH_320MHZ &&
+		    policy_mgr_is_conn_lead_to_dbs_sbs(mac->psoc,
+						       session->curr_op_freq))
+			wlan_mlme_set_ap_oper_ch_width(session->vdev,
+						       CH_WIDTH_160MHZ);
 	}
 	mlme_obj->mgmt.generic.maxregpower = session->maxTxPower;
 	mlme_obj->proto.generic.beacon_interval =

core/mac/src/sys/legacy/src/utils/src/parser_api.c

@@ -9683,29 +9683,33 @@ QDF_STATUS populate_dot11f_eht_operation(struct mac_context *mac_ctx,
 					 struct pe_session *session,
 					 tDot11fIEeht_op *eht_op)
 {
+	enum phy_ch_width oper_ch_width;
+
 	qdf_mem_copy(eht_op, &session->eht_op, sizeof(*eht_op));
 
 	eht_op->present = 1;
 
 	eht_op->eht_op_information_present = 1;
-	if (session->ch_width == CH_WIDTH_320MHZ) {
+
+	oper_ch_width = wlan_mlme_get_ap_oper_ch_width(session->vdev);
+	if (oper_ch_width == CH_WIDTH_320MHZ) {
 		eht_op->channel_width = WLAN_EHT_CHWIDTH_320;
 		eht_op->ccfs0 = session->ch_center_freq_seg0;
 		eht_op->ccfs1 = session->ch_center_freq_seg1;
-	} else if (session->ch_width == CH_WIDTH_160MHZ ||
-		   session->ch_width == CH_WIDTH_80P80MHZ) {
+	} else if (oper_ch_width == CH_WIDTH_160MHZ ||
+		   oper_ch_width == CH_WIDTH_80P80MHZ) {
 		eht_op->channel_width = WLAN_EHT_CHWIDTH_160;
 		eht_op->ccfs0 = session->ch_center_freq_seg0;
 		eht_op->ccfs1 = session->ch_center_freq_seg1;
-	} else if (session->ch_width == CH_WIDTH_80MHZ) {
+	} else if (oper_ch_width == CH_WIDTH_80MHZ) {
 		eht_op->channel_width = WLAN_EHT_CHWIDTH_80;
 		eht_op->ccfs0 = session->ch_center_freq_seg0;
 		eht_op->ccfs1 = 0;
-	} else if (session->ch_width == CH_WIDTH_40MHZ) {
+	} else if (oper_ch_width == CH_WIDTH_40MHZ) {
 		eht_op->channel_width = WLAN_EHT_CHWIDTH_40;
 		eht_op->ccfs0 = session->ch_center_freq_seg0;
 		eht_op->ccfs1 = 0;
-	} else if (session->ch_width == CH_WIDTH_20MHZ) {
+	} else if (oper_ch_width == CH_WIDTH_20MHZ) {
 		eht_op->channel_width = WLAN_EHT_CHWIDTH_20;
 		eht_op->ccfs0 = session->ch_center_freq_seg0;
 		eht_op->ccfs1 = 0;