From 555d20fd3d88fa4f444ea067f589db33b1433b29 Mon Sep 17 00:00:00 2001 From: Abhinav Kumar Date: Thu, 4 Jun 2020 12:22:19 +0530 Subject: [PATCH] qcacld-3.0: Fix invalid opclass error while processing BCN RPT In case if AP's country code present as "US 0x4" in beacon report request, it means AP wants us to use global opclass. Fix is to allow driver to use global opclass AP's country code present as "US 0x4" in beacon report. Change-Id: I3f6c132803dc4c5a85aea95c5fc39ac7be670aee CRs-fixed: 2706733 --- core/mac/src/pe/rrm/rrm_api.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/core/mac/src/pe/rrm/rrm_api.c b/core/mac/src/pe/rrm/rrm_api.c index 4959aafbe6..4768e987ee 100644 --- a/core/mac/src/pe/rrm/rrm_api.c +++ b/core/mac/src/pe/rrm/rrm_api.c @@ -742,10 +742,11 @@ rrm_process_beacon_report_req(struct mac_context *mac, } psbrr->channel_list.chan_freq_lst[ch_ctr++] = - wlan_reg_chan_opclass_to_freq( + wlan_reg_country_chan_opclass_to_freq( + mac->pdev, country, ie_ap_chan_rpt->channelList[tmp_idx], - ie_ap_chan_rpt->regulatoryClass, - false); + ie_ap_chan_rpt->regulatoryClass, true); + if (ch_ctr >= QDF_ARRAY_SIZE(psbrr->channel_list.chan_freq_lst)) break; }