From 9bcf639924b2e77e5b6aa3c339f76a40405f4ec4 Mon Sep 17 00:00:00 2001 From: Gururaj Pandurangi Date: Wed, 30 Oct 2019 12:11:49 -0700 Subject: [PATCH] qcacld-3.0: Replace channel id with frequency Replace channel ID with channel frequency in tSirMacChanNum limReassocChannelId under struct pe_session Change-Id: Ice8565ebcfcb863b7da7ec14a36b3abf3332ebab CRs-Fixed: 2556247 --- core/mac/src/pe/include/lim_session.h | 2 +- core/mac/src/pe/lim/lim_ft.c | 2 +- core/mac/src/pe/lim/lim_process_sme_req_messages.c | 6 ++---- core/mac/src/pe/lim/lim_reassoc_utils.c | 3 +-- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/core/mac/src/pe/include/lim_session.h b/core/mac/src/pe/include/lim_session.h index b9c59beabbd98..367ddd97100dd 100644 --- a/core/mac/src/pe/include/lim_session.h +++ b/core/mac/src/pe/include/lim_session.h @@ -192,7 +192,7 @@ struct pe_session { /* Parameters For Reassociation */ tSirMacAddr limReAssocbssId; - tSirMacChanNum limReassocChannelId; + uint32_t lim_reassoc_chan_freq; /* CB paramaters required/duplicated for Reassoc since re-assoc mantains its own params in lim */ uint8_t reAssocHtSupportedChannelWidthSet; uint8_t reAssocHtRecommendedTxWidthSet; diff --git a/core/mac/src/pe/lim/lim_ft.c b/core/mac/src/pe/lim/lim_ft.c index a47374a52e323..14457e9598e39 100644 --- a/core/mac/src/pe/lim/lim_ft.c +++ b/core/mac/src/pe/lim/lim_ft.c @@ -513,7 +513,7 @@ void lim_fill_ft_session(struct mac_context *mac, /* Copy The channel Id to the session Table */ bss_chan_id = wlan_reg_freq_to_chan(mac->pdev, pbssDescription->chan_freq); - ft_session->limReassocChannelId = bss_chan_id; + ft_session->lim_reassoc_chan_freq = pbssDescription->chan_freq; ft_session->curr_op_freq = pbssDescription->chan_freq; ft_session->limRFBand = lim_get_rf_band(wlan_reg_freq_to_chan( mac->pdev, ft_session->curr_op_freq)); diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c index 1641386852941..f5658393b4a8c 100644 --- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c @@ -1912,10 +1912,8 @@ static void __lim_process_sme_reassoc_req(struct mac_context *mac_ctx, session_entry->pLimReAssocReq->bssDescription.bssId, sizeof(tSirMacAddr)); - session_entry->limReassocChannelId = wlan_reg_freq_to_chan( - mac_ctx->pdev, - session_entry->pLimReAssocReq->bssDescription.chan_freq); - + session_entry->lim_reassoc_chan_freq = + session_entry->pLimReAssocReq->bssDescription.chan_freq; session_entry->reAssocHtSupportedChannelWidthSet = (session_entry->pLimReAssocReq->cbMode) ? 1 : 0; session_entry->reAssocHtRecommendedTxWidthSet = diff --git a/core/mac/src/pe/lim/lim_reassoc_utils.c b/core/mac/src/pe/lim/lim_reassoc_utils.c index f17fe7661a32c..e57a2fa2ccb6d 100644 --- a/core/mac/src/pe/lim/lim_reassoc_utils.c +++ b/core/mac/src/pe/lim/lim_reassoc_utils.c @@ -63,8 +63,7 @@ void lim_update_re_assoc_globals(struct mac_context *mac, tpSirAssocRsp pAssocRs /* Update the current Bss Information */ qdf_mem_copy(pe_session->bssId, pe_session->limReAssocbssId, sizeof(tSirMacAddr)); - pe_session->curr_op_freq = wlan_reg_chan_to_freq( - mac->pdev, pe_session->limReassocChannelId); + pe_session->curr_op_freq = pe_session->lim_reassoc_chan_freq; pe_session->htSecondaryChannelOffset = pe_session->reAssocHtSupportedChannelWidthSet; pe_session->htRecommendedTxWidthSet =