Эх сурвалжийг харах

Revert "qcacld-3.0: Report BSS of only requested RC in Rrm"

This reverts commit I98c80ab3d53dd9d63225349e3c7657f48c758957.

In cld3.2, DUT cannot follow connected AP country
code but the 11d scan results.
DUT will send all the valid channels reports to AP
regardless of the required RC in beacon request.

Change-Id: I4b2e33b4b9452416d79c47aeaeeccee0811f0bfe
CRs-Fixed: 2272049
tinlin 6 жил өмнө
parent
commit
5596e6fa08

+ 1 - 15
core/sme/src/rrm/sme_rrm.c

@@ -26,7 +26,6 @@
 #include "sme_inside.h"
 #include "sme_api.h"
 #include "cfg_api.h"
-#include "cds_regdomain.h"
 
 #ifdef FEATURE_WLAN_DIAG_SUPPORT
 #include "host_diag_core_event.h"
@@ -902,7 +901,6 @@ QDF_STATUS sme_rrm_process_beacon_report_req_ind(tpAniSirGlobal pMac,
 	tpSirBeaconReportReqInd pBeaconReq = (tpSirBeaconReportReqInd) pMsgBuf;
 	tpRrmSMEContext pSmeRrmContext = &pMac->rrm.rrmSmeContext;
 	uint32_t len = 0, i = 0;
-	uint8_t temp = 0;
 
 	sme_debug("Received Beacon report request ind Channel = %d",
 		pBeaconReq->channelInfo.channelNum);
@@ -920,19 +918,7 @@ QDF_STATUS sme_rrm_process_beacon_report_req_ind(tpAniSirGlobal pMac,
 		}
 		csr_get_cfg_valid_channels(pMac, pSmeRrmContext->channelList.
 					ChannelList, &len);
-
-		for (i = 0; i < len; i++) {
-			if (wlan_reg_dmn_get_opclass_from_channel(
-			    pMac->scan.countryCodeCurrent,
-			    pSmeRrmContext->channelList.ChannelList[i],
-			    BWALL) ==
-			    pBeaconReq->channelInfo.regulatoryClass) {
-				pSmeRrmContext->channelList.ChannelList[temp] =
-				  pSmeRrmContext->channelList.ChannelList[i];
-				temp++;
-			}
-		}
-		pSmeRrmContext->channelList.numOfChannels = (uint8_t)temp;
+		pSmeRrmContext->channelList.numOfChannels = (uint8_t) len;
 	} else {
 		len = 0;
 		pSmeRrmContext->channelList.numOfChannels = 0;