qcacld-3.0: Replace channel with frequency in struct sSirProbeRespBeacon

Replace channel with frequency in struct sSirProbeRespBeacon.

Change-Id: I2407ed3e6ddd11c72c7b4359197241654922ea65
CRs-Fixed: 2556361

core/mac/src/include/parser_api.h

@@ -201,7 +201,7 @@ typedef struct sSirProbeRespBeacon {
 	tSirMacSSid ssId;
 	tSirMacRateSet supportedRates;
 	tSirMacRateSet extendedRates;
-	tSirMacChanNum channelNumber;
+	uint32_t chan_freq;
 	tSirMacCfParamSet cfParamSet;
 	tSirMacTim tim;
 	tSirMacEdcaParamSetIE edcaParams;

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

@@ -235,7 +235,18 @@ static inline tLimSmeStates lim_get_sme_state(struct mac_context *mac)
 	return mac->lim.gLimSmeState;
 }
 
-void lim_received_hb_handler(struct mac_context *, uint8_t,
+/**
+ * lim_received_hb_handler() - This function is called by
+ * sch_beacon_process() upon receiving a Beacon on STA. This
+ * also gets called upon receiving Probe Response after heat
+ * beat failure is detected.
+ *
+ * @mac - global mac structure
+ * @chan_freq - channel frequency indicated in Beacon, Probe
+ *
+ * Response return - none
+ */
+void lim_received_hb_handler(struct mac_context *, uint32_t,
 			     struct pe_session *);
 
 /* / Function that triggers STA context deletion */

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

@@ -1312,26 +1312,11 @@ void pe_register_callbacks_with_wma(struct mac_context *mac,
 		pe_err("Registering roaming callbacks with WMA failed");
 }
 
-/**
- *\brief lim_received_hb_handler()
- *
- * This function is called by sch_beacon_process() upon
- * receiving a Beacon on STA. This also gets called upon
- * receiving Probe Response after heat beat failure is
- * detected.
- *
- * param mac - global mac structure
- * param channel - channel number indicated in Beacon, Probe Response
- * return - none
- */
-
 void
-lim_received_hb_handler(struct mac_context *mac, uint8_t channelId,
+lim_received_hb_handler(struct mac_context *mac, uint32_t chan_freq,
 			struct pe_session *pe_session)
 {
-	if (channelId == 0 ||
-	    channelId == wlan_reg_freq_to_chan(mac->pdev,
-					       pe_session->curr_op_freq))
+	if (chan_freq == 0 || chan_freq == pe_session->curr_op_freq)
 		pe_session->LimRxedBeaconCntDuringHB++;
 
 	pe_session->pmmOffloadInfo.bcnmiss = false;
@@ -1442,8 +1427,7 @@ lim_handle_ibss_coalescing(struct mac_context *mac,
 	 */
 	if ((!pBeacon->capabilityInfo.ibss) ||
 	    lim_cmp_ssid(&pBeacon->ssId, pe_session) ||
-	    (wlan_reg_freq_to_chan(mac->pdev, pe_session->curr_op_freq)
-	     != pBeacon->channelNumber))
+	    (pe_session->curr_op_freq != pBeacon->chan_freq))
 		retCode = QDF_STATUS_E_INVAL;
 	else if (lim_ibss_enc_type_matched(pBeacon, pe_session) != true) {
 		pe_debug("peer privacy: %d peer wpa: %d peer rsn: %d self encType: %d",
@@ -1577,13 +1561,13 @@ lim_detect_change_in_ap_capabilities(struct mac_context *mac,
 {
 	uint8_t len;
 	struct ap_new_caps apNewCaps;
-	uint8_t newChannel;
+	uint32_t new_chan_freq;
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	bool security_caps_matched = true;
 
 	apNewCaps.capabilityInfo =
 		lim_get_u16((uint8_t *) &pBeacon->capabilityInfo);
-	newChannel = (uint8_t) pBeacon->channelNumber;
+	new_chan_freq = pBeacon->chan_freq;
 
 	security_caps_matched = lim_enc_type_matched(mac, pBeacon,
 						     pe_session);
@@ -1596,9 +1580,8 @@ lim_detect_change_in_ap_capabilities(struct mac_context *mac,
 	       SIR_MAC_GET_PRIVACY(pe_session->limCurrentBssCaps)) ||
 	      (SIR_MAC_GET_QOS(apNewCaps.capabilityInfo) !=
 	       SIR_MAC_GET_QOS(pe_session->limCurrentBssCaps)) ||
-	      ((newChannel != wlan_reg_freq_to_chan(
-				mac->pdev, pe_session->curr_op_freq)) &&
-		(newChannel != 0)) ||
+	      ((new_chan_freq != pe_session->curr_op_freq) &&
+		(new_chan_freq != 0)) ||
 	      (false == security_caps_matched)
 	     ))) {
 		if (false == pe_session->fWaitForProbeRsp) {
@@ -1636,12 +1619,9 @@ lim_detect_change_in_ap_capabilities(struct mac_context *mac,
 
 		qdf_mem_copy(apNewCaps.bssId.bytes,
 			     pe_session->bssId, QDF_MAC_ADDR_SIZE);
-		if (newChannel != wlan_reg_freq_to_chan(
-				mac->pdev, pe_session->curr_op_freq)) {
-			pe_err("Channel Change from %d --> %d Ignoring beacon!",
-				wlan_reg_freq_to_chan(
-					mac->pdev, pe_session->curr_op_freq),
-					newChannel);
+		if (new_chan_freq != pe_session->curr_op_freq) {
+			pe_err("Channel freq Change from %d --> %d Ignoring beacon!",
+			       pe_session->curr_op_freq, new_chan_freq);
 			return;
 		}
 
@@ -2141,10 +2121,12 @@ lim_roam_fill_bss_descr(struct mac_context *mac,
 	bss_desc_ptr->fProbeRsp = !roam_synch_ind_ptr->isBeacon;
 	/* Copy Timestamp */
 	bss_desc_ptr->scansystimensec = qdf_get_monotonic_boottime_ns();
-	if (parsed_frm_ptr->dsParamsPresent) {
-		bss_desc_ptr->chan_freq =
-			wlan_reg_chan_to_freq(mac->pdev,
-					      parsed_frm_ptr->channelNumber);
+	if (parsed_frm_ptr->he_op.oper_info_6g_present) {
+		bss_desc_ptr->chan_freq = wlan_reg_chan_band_to_freq(mac->pdev,
+						parsed_frm_ptr->he_op.oper_info_6g.info.primary_ch,
+						BIT(REG_BAND_6G));
+	} else if (parsed_frm_ptr->dsParamsPresent) {
+		bss_desc_ptr->chan_freq = parsed_frm_ptr->chan_freq;
 	} else if (parsed_frm_ptr->HTInfo.present) {
 		bss_desc_ptr->chan_freq =
 			wlan_reg_chan_to_freq(mac->pdev,
@@ -2160,8 +2142,7 @@ lim_roam_fill_bss_descr(struct mac_context *mac,
 
 	bss_desc_ptr->nwType = lim_get_nw_type(
 			mac,
-			wlan_reg_freq_to_chan(mac->pdev,
-					      bss_desc_ptr->chan_freq),
+			bss_desc_ptr->chan_freq,
 			SIR_MAC_MGMT_FRAME,
 			parsed_frm_ptr);
 

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

@@ -108,6 +108,7 @@ lim_process_probe_rsp_frame(struct mac_context *mac_ctx, uint8_t *rx_Packet_info
 	tSirProbeRespBeacon *probe_rsp;
 	uint8_t qos_enabled = false;
 	uint8_t wme_enabled = false;
+	uint32_t chan_freq = 0;
 
 	if (!session_entry) {
 		pe_err("session_entry is NULL");
@@ -204,14 +205,16 @@ lim_process_probe_rsp_frame(struct mac_context *mac_ctx, uint8_t *rx_Packet_info
 		}
 		if (!LIM_IS_CONNECTION_ACTIVE(session_entry)) {
 			pe_warn("Recved Probe Resp from AP,AP-alive");
-			if (probe_rsp->HTInfo.present)
+			if (probe_rsp->HTInfo.present) {
+				chan_freq =
+				    wlan_reg_legacy_chan_to_freq(mac_ctx->pdev,
+								 probe_rsp->HTInfo.primaryChannel);
+				lim_received_hb_handler(mac_ctx, chan_freq,
+							session_entry);
+			} else
 				lim_received_hb_handler(mac_ctx,
-					probe_rsp->HTInfo.primaryChannel,
-					session_entry);
-			else
-				lim_received_hb_handler(mac_ctx,
-					(uint8_t)probe_rsp->channelNumber,
-					session_entry);
+							probe_rsp->chan_freq,
+							session_entry);
 		}
 		if (LIM_IS_STA_ROLE(session_entry) &&
 				!wma_is_csa_offload_enabled()) {

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

@@ -267,6 +267,7 @@ void lim_extract_ap_capability(struct mac_context *mac_ctx, uint8_t *p_ie,
 	struct s_ext_cap *ext_cap;
 	uint8_t chan_center_freq_seg1;
 	tDot11fIEVHTCaps *vht_caps;
+	uint8_t channel = 0;
 
 	beacon_struct = qdf_mem_malloc(sizeof(tSirProbeRespBeacon));
 	if (!beacon_struct)
@@ -387,6 +388,8 @@ void lim_extract_ap_capability(struct mac_context *mac_ctx, uint8_t *p_ie,
 		 */
 		session->ch_center_freq_seg0 = vht_op->chan_center_freq_seg0;
 		session->ch_center_freq_seg1 = chan_center_freq_seg1;
+		channel = wlan_reg_freq_to_chan(mac_ctx->pdev,
+						beacon_struct->chan_freq);
 		if (vht_ch_wd == WNI_CFG_VHT_CHANNEL_WIDTH_160MHZ) {
 			/* DUT or AP supports only 160MHz */
 			if (ap_bcon_ch_width ==
@@ -396,8 +399,7 @@ void lim_extract_ap_capability(struct mac_context *mac_ctx, uint8_t *p_ie,
 					session->ch_center_freq_seg1 =
 						vht_op->chan_center_freq_seg0;
 					session->ch_center_freq_seg0 =
-						lim_get_80Mhz_center_channel(
-						beacon_struct->channelNumber);
+						lim_get_80Mhz_center_channel(channel);
 				}
 			} else {
 				/* DUT supports only 160MHz and AP is
@@ -413,8 +415,7 @@ void lim_extract_ap_capability(struct mac_context *mac_ctx, uint8_t *p_ie,
 					!new_ch_width_dfn)
 				/* AP is in 160MHz mode */
 				session->ch_center_freq_seg0 =
-					lim_get_80Mhz_center_channel(
-						beacon_struct->channelNumber);
+					lim_get_80Mhz_center_channel(channel);
 			else
 				session->ch_center_freq_seg1 = 0;
 		}

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

@@ -69,7 +69,7 @@ lim_collect_bss_description(struct mac_context *mac,
 	uint8_t *pBody;
 	uint32_t ieLen = 0;
 	tpSirMacMgmtHdr pHdr;
-	uint8_t channel_num;
+	uint32_t chan_freq;
 	uint8_t rfBand = 0;
 
 	pHdr = WMA_GET_RX_MAC_HEADER(pRxPacketInfo);
@@ -130,12 +130,12 @@ lim_collect_bss_description(struct mac_context *mac,
 	 * This fix will work for 5Ghz 11n devices, but for 11a devices, we have to rely on RXP routing flag to get the correct channel.
 	 * So The problem of incorrect channel reporting in 5Ghz will still remain for 11a devices.
 	 */
-	channel_num = lim_get_channel_from_beacon(mac, pBPR);
-	pBssDescr->chan_freq = wlan_reg_chan_to_freq(mac->pdev, channel_num);
+	chan_freq = lim_get_channel_from_beacon(mac, pBPR);
+	pBssDescr->chan_freq = chan_freq;
 
 	/* set the network type in bss description */
 	pBssDescr->nwType =
-		lim_get_nw_type(mac, channel_num, SIR_MAC_MGMT_FRAME, pBPR);
+		lim_get_nw_type(mac, chan_freq, SIR_MAC_MGMT_FRAME, pBPR);
 
 	/* Copy RSSI & SINR from BD */
 	pBssDescr->rssi = (int8_t) WMA_GET_RX_RSSI_NORMALIZED(pRxPacketInfo);
@@ -189,7 +189,7 @@ lim_collect_bss_description(struct mac_context *mac,
 		     pBody + SIR_MAC_B_PR_SSID_OFFSET, ieLen);
 
 	/*set channel number in beacon in case it is not present */
-	pBPR->channelNumber = channel_num;
+	pBPR->chan_freq = chan_freq;
 	mac->lim.beacon_probe_rsp_cnt_per_scan++;
 
 	return;

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

@@ -4497,30 +4497,20 @@ lim_prepare_for11h_channel_switch(struct mac_context *mac, struct pe_session *pe
 	lim_stop_tx_and_switch_channel(mac, pe_session->peSessionId);
 }
 
-/**----------------------------------------------------
-   \fn        lim_get_nw_type
-
-   \brief    Get type of the network from data packet or beacon
-   \param mac
-   \param channelNum - Channel number
-   \param type - Type of packet.
-   \param pBeacon - Pointer to beacon or probe response
-
-   \return Network type a/b/g.
-   -----------------------------------------------------*/
-tSirNwType lim_get_nw_type(struct mac_context *mac, uint8_t channelNum, uint32_t type,
+tSirNwType lim_get_nw_type(struct mac_context *mac, uint32_t chan_freq, uint32_t type,
 			   tpSchBeaconStruct pBeacon)
 {
 	tSirNwType nwType = eSIR_11B_NW_TYPE;
 
+	/* Logic to be cleaned up for 11AC & 11AX */
 	if (type == SIR_MAC_DATA_FRAME) {
-		if ((channelNum > 0) && (channelNum < 15)) {
+		if (WLAN_REG_IS_24GHZ_CH_FREQ(chan_freq)) {
 			nwType = eSIR_11G_NW_TYPE;
 		} else {
 			nwType = eSIR_11A_NW_TYPE;
 		}
 	} else {
-		if ((channelNum > 0) && (channelNum < 15)) {
+		if (WLAN_REG_IS_24GHZ_CH_FREQ(chan_freq)) {
 			int i;
 			/* 11b or 11g packet */
 			/* 11g iff extended Rate IE is present or */
@@ -4546,26 +4536,23 @@ tSirNwType lim_get_nw_type(struct mac_context *mac, uint8_t channelNum, uint32_t
 	return nwType;
 }
 
-/**---------------------------------------------------------
-   \fn        lim_get_channel_from_beacon
-   \brief    To extract channel number from beacon
-
-   \param mac
-   \param pBeacon - Pointer to beacon or probe rsp
-   \return channel number
-   -----------------------------------------------------------*/
-uint8_t lim_get_channel_from_beacon(struct mac_context *mac, tpSchBeaconStruct pBeacon)
+uint32_t lim_get_channel_from_beacon(struct mac_context *mac, tpSchBeaconStruct pBeacon)
 {
-	uint8_t channelNum = 0;
+	uint8_t chan_freq = 0;
 
-	if (pBeacon->dsParamsPresent)
-		channelNum = pBeacon->channelNumber;
+	if (pBeacon->he_op.oper_info_6g_present)
+		chan_freq = wlan_reg_chan_band_to_freq(mac->pdev,
+						   pBeacon->he_op.oper_info_6g.info.primary_ch,
+						   BIT(REG_BAND_6G));
+	else if (pBeacon->dsParamsPresent)
+		chan_freq = pBeacon->chan_freq;
 	else if (pBeacon->HTInfo.present)
-		channelNum = pBeacon->HTInfo.primaryChannel;
+		chan_freq = wlan_reg_legacy_chan_to_freq(mac->pdev,
+							 pBeacon->HTInfo.primaryChannel);
 	else
-		channelNum = pBeacon->channelNumber;
+		chan_freq = pBeacon->chan_freq;
 
-	return channelNum;
+	return chan_freq;
 }
 
 void lim_set_tspec_uapsd_mask_per_session(struct mac_context *mac,

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

@@ -501,10 +501,30 @@ void lim_delete_dialogue_token_list(struct mac_context *mac);
 void lim_add_channel_status_info(struct mac_context *p_mac,
 				 struct lim_channel_status *channel_stat,
 				 uint8_t channel_id);
-uint8_t lim_get_channel_from_beacon(struct mac_context *mac,
-		tpSchBeaconStruct pBeacon);
-tSirNwType lim_get_nw_type(struct mac_context *mac, uint8_t channelNum,
-		uint32_t type, tpSchBeaconStruct pBeacon);
+
+/**
+ * lim_get_channel_from_beacon() - extract channel number
+ * from beacon and convert to channel frequency
+ * @mac: Pointer to Global MAC structure
+ * @pBeacon: Pointer to beacon or probe rsp
+ *
+ * Return: channel frequency
+ */
+uint32_t lim_get_channel_from_beacon(struct mac_context *mac,
+				     tpSchBeaconStruct pBeacon);
+
+/**
+ * lim_get_nw_type() - Get type of the network from
+ * data packet or beacon
+ * @mac: Pointer to Global MAC structure
+ * @chan_freq: Channel frequency
+ * @type: Type of packet
+ * @pBeacon: Pointer to beacon or probe response
+ *
+ * Return: Network type a/b/g
+ */
+tSirNwType lim_get_nw_type(struct mac_context *mac, uint32_t chan_freq,
+			   uint32_t type, tpSchBeaconStruct pBeacon);
 
 void lim_set_tspec_uapsd_mask_per_session(struct mac_context *mac,
 		struct pe_session *pe_session,

core/mac/src/pe/sch/sch_beacon_process.c

@@ -57,8 +57,7 @@ ap_beacon_process_5_ghz(struct mac_context *mac_ctx, uint8_t *rx_pkt_info,
 	if (!session->htCapability)
 		return;
 
-	if (bcn_struct->channelNumber != wlan_reg_freq_to_chan(
-		mac_ctx->pdev, session->curr_op_freq))
+	if (bcn_struct->chan_freq != session->curr_op_freq)
 		return;
 
 	/* 11a (non HT) AP  overlaps or */
@@ -101,8 +100,7 @@ ap_beacon_process_24_ghz(struct mac_context *mac_ctx, uint8_t *rx_pkt_info,
 	/* We are 11G AP. */
 	if ((phy_mode == WNI_CFG_PHY_MODE_11G) &&
 	    (false == session->htCapability)) {
-		if (bcn_struct->channelNumber != wlan_reg_freq_to_chan(
-			mac_ctx->pdev, session->curr_op_freq))
+		if (bcn_struct->chan_freq != session->curr_op_freq)
 			return;
 
 		tmp_exp = (!bcn_struct->erpPresent &&
@@ -131,8 +129,7 @@ ap_beacon_process_24_ghz(struct mac_context *mac_ctx, uint8_t *rx_pkt_info,
 	if (!session->htCapability)
 		return;
 
-	if (bcn_struct->channelNumber != wlan_reg_freq_to_chan(
-		mac_ctx->pdev, session->curr_op_freq))
+	if (bcn_struct->chan_freq != session->curr_op_freq)
 		return;
 
 	tmp_exp = (!bcn_struct->erpPresent && !bcn_struct->HTInfo.present) ||
@@ -351,12 +348,9 @@ sch_bcn_process_sta(struct mac_context *mac_ctx,
 	 * This is the Beacon received from the AP  we're currently associated
 	 * with. Check if there are any changes in AP's capabilities
 	 */
-	if (bcn->channelNumber != wlan_reg_freq_to_chan(
-		mac_ctx->pdev, session->curr_op_freq)) {
+	if (bcn->chan_freq != session->curr_op_freq) {
 		pe_err("Channel Change freq from %d --> %d - Ignoring beacon!",
-		       session->curr_op_freq,
-		       wlan_reg_chan_to_freq(
-				mac_ctx->pdev, bcn->channelNumber));
+		       session->curr_op_freq, bcn->chan_freq);
 		return false;
 	}
 
@@ -810,6 +804,7 @@ static void __sch_beacon_process_for_session(struct mac_context *mac_ctx,
 	tpSirMacMgmtHdr pMh = WMA_GET_RX_MAC_HEADER(rx_pkt_info);
 	int8_t regMax = 0, maxTxPower = 0, local_constraint;
 	struct lim_max_tx_pwr_attr tx_pwr_attr = {0};
+	uint32_t chan_freq = 0;
 
 	qdf_mem_zero(&beaconParams, sizeof(tUpdateBeaconParams));
 	beaconParams.paramChangeBitmap = 0;
@@ -901,12 +896,12 @@ static void __sch_beacon_process_for_session(struct mac_context *mac_ctx,
 	}
 
 	/* Indicate to LIM that Beacon is received */
-	if (bcn->HTInfo.present)
-		lim_received_hb_handler(mac_ctx,
-				(uint8_t) bcn->HTInfo.primaryChannel, session);
-	else
-		lim_received_hb_handler(mac_ctx, (uint8_t) bcn->channelNumber,
-				session);
+	if (bcn->HTInfo.present) {
+		chan_freq = wlan_reg_legacy_chan_to_freq(mac_ctx->pdev,
+							 bcn->HTInfo.primaryChannel);
+		lim_received_hb_handler(mac_ctx, chan_freq, session);
+	} else
+		lim_received_hb_handler(mac_ctx, bcn->chan_freq, session);
 
 	/*
 	 * I don't know if any additional IE is required here. Currently, not
@@ -1108,8 +1103,7 @@ void sch_send_beacon_report(struct mac_context *mac_ctx,
 		qdf_mem_copy(&beacon_report.time_stamp,
 			     &beacon_struct->timeStamp, sizeof(qdf_time_t));
 		beacon_report.beacon_interval = beacon_struct->beaconInterval;
-		beacon_report.frequency =
-				cds_chan_to_freq(beacon_struct->channelNumber);
+		beacon_report.frequency = beacon_struct->chan_freq;
 
 		beacon_report.ssid.length = beacon_struct->ssId.length;
 		qdf_mem_copy(&beacon_report.ssid.ssid,

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

@@ -2447,11 +2447,17 @@ QDF_STATUS sir_convert_probe_frame2_struct(struct mac_context *mac,
 			     sizeof(tDot11fIEHTInfo));
 	}
 
-	if (pr->DSParams.present) {
+	if (pr->he_op.oper_info_6g_present) {
+		pProbeResp->chan_freq = wlan_reg_chan_band_to_freq(mac->pdev,
+						pr->he_op.oper_info_6g.info.primary_ch,
+						BIT(REG_BAND_6G));
+	} else if (pr->DSParams.present) {
 		pProbeResp->dsParamsPresent = 1;
-		pProbeResp->channelNumber = pr->DSParams.curr_channel;
+		pProbeResp->chan_freq =
+		    wlan_reg_legacy_chan_to_freq(mac->pdev, pr->DSParams.curr_channel);
 	} else if (pr->HTInfo.present) {
-		pProbeResp->channelNumber = pr->HTInfo.primaryChannel;
+		pProbeResp->chan_freq =
+		    wlan_reg_legacy_chan_to_freq(mac->pdev, pr->HTInfo.primaryChannel);
 	}
 
 	if (pr->RSNOpaque.present) {
@@ -3893,11 +3899,19 @@ sir_parse_beacon_ie(struct mac_context *mac,
 			     sizeof(tDot11fIEHTInfo));
 	}
 
-	if (pBies->DSParams.present) {
+	if (pBies->he_op.oper_info_6g_present) {
+		pBeaconStruct->chan_freq = wlan_reg_chan_band_to_freq(mac->pdev,
+						pBies->he_op.oper_info_6g.info.primary_ch,
+						BIT(REG_BAND_6G));
+	} else if (pBies->DSParams.present) {
 		pBeaconStruct->dsParamsPresent = 1;
-		pBeaconStruct->channelNumber = pBies->DSParams.curr_channel;
+		pBeaconStruct->chan_freq =
+		    wlan_reg_legacy_chan_to_freq(mac->pdev,
+						 pBies->DSParams.curr_channel);
 	} else if (pBies->HTInfo.present) {
-		pBeaconStruct->channelNumber = pBies->HTInfo.primaryChannel;
+		pBeaconStruct->chan_freq =
+		    wlan_reg_legacy_chan_to_freq(mac->pdev,
+						 pBies->HTInfo.primaryChannel);
 	}
 
 	if (pBies->RSN.present) {
@@ -4214,15 +4228,21 @@ sir_convert_beacon_frame2_struct(struct mac_context *mac,
 
 	}
 
-	if (pBeacon->DSParams.present) {
+	if (pBeacon->he_op.oper_info_6g_present) {
+		pBeaconStruct->chan_freq = wlan_reg_chan_band_to_freq(mac->pdev,
+						pBeacon->he_op.oper_info_6g.info.primary_ch,
+						BIT(REG_BAND_6G));
+	} else if (pBeacon->DSParams.present) {
 		pBeaconStruct->dsParamsPresent = 1;
-		pBeaconStruct->channelNumber = pBeacon->DSParams.curr_channel;
+		pBeaconStruct->chan_freq =
+		    wlan_reg_legacy_chan_to_freq(mac->pdev,
+						 pBeacon->DSParams.curr_channel);
 	} else if (pBeacon->HTInfo.present) {
-		pBeaconStruct->channelNumber = pBeacon->HTInfo.primaryChannel;
+		pBeaconStruct->chan_freq =
+		    wlan_reg_legacy_chan_to_freq(mac->pdev,
+						 pBeacon->HTInfo.primaryChannel);
 	} else {
-		pBeaconStruct->channelNumber =
-			wlan_reg_freq_to_chan(mac->pdev,
-					      WMA_GET_RX_FREQ(pFrame));
+		pBeaconStruct->chan_freq = WMA_GET_RX_FREQ(pFrame);
 		pe_debug_rl("In Beacon No Channel info");
 	}