diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index a91af3c91c4b..bb5ba7989ef1 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -1158,7 +1158,7 @@ typedef enum eSirSmeStatusChangeCode { struct new_bss_info { struct qdf_mac_addr bssId; - uint8_t channelNumber; + uint32_t freq; uint8_t reserved; tSirMacSSid ssId; }; diff --git a/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c b/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c index fe9e16b47cf8..0b4e01287a9c 100644 --- a/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c +++ b/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c @@ -1249,7 +1249,8 @@ void lim_ibss_add_bss_rsp_when_coalescing(struct mac_context *mac, void *msg, qdf_mem_zero((void *)&newBssInfo, sizeof(newBssInfo)); qdf_mem_copy(newBssInfo.bssId.bytes, pHdr->bssId, QDF_MAC_ADDR_SIZE); - newBssInfo.channelNumber = (tSirMacChanNum) pAddBss->currentOperChannel; + newBssInfo.freq = wlan_reg_chan_to_freq(mac->pdev, + pAddBss->currentOperChannel); qdf_mem_copy((uint8_t *) &newBssInfo.ssId, (uint8_t *) &pBeacon->ssId, pBeacon->ssId.length + 1); diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index eee56e7fbddc..c9209e6b738d 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -11802,7 +11802,9 @@ csr_roam_diag_joined_new_bss(struct mac_context *mac_ctx, pNewBss->ssId.length = HOST_LOG_MAX_SSID_SIZE; qdf_mem_copy(pIbssLog->ssid, pNewBss->ssId.ssId, pNewBss->ssId.length); - pIbssLog->operatingChannel = pNewBss->channelNumber; + pIbssLog->operatingChannel = wlan_reg_freq_to_chan + (mac_ctx->pdev, + pNewBss->freq); } bi = mac_ctx->mlme_cfg->sap_cfg.beacon_interval; /* U8 is not enough for beacon interval */ @@ -14280,7 +14282,7 @@ static void csr_roam_update_connected_profile_from_new_bss(struct mac_context *m if (pNewBss) { /* Set the operating channel. */ pSession->connectedProfile.operationChannel = - pNewBss->channelNumber; + wlan_reg_freq_to_chan(mac->pdev, pNewBss->freq); /* move the BSSId from the BSS description into the connected * state information. */