From 4f660677dc644bd4be9d1ead0c2cf1a070614aef Mon Sep 17 00:00:00 2001 From: "Edhar, Mahesh Kumar" Date: Fri, 30 Oct 2015 11:53:26 +0530 Subject: [PATCH] qcacld-3.0: Properly update specturum channel list qcacld-2.0 to qcacld-3.0 propagation Currently for ACS,one to one correspondence between channel number and index of Sap specturum structure is desired. But the correspondence is broken in case of channel in NOL list or if the DFS channels are not allowed. In case of channel in NOL list or if DFS channel not allowed, channel number is incremented but index of structure doesn't change. As a part of fix, made sure that one to one correspondence is maintained. Change-Id: I05cbe92e2657d96e271b402b9fdbe41a32c7080d CRs-Fixed: 922865 --- core/sap/src/sap_ch_select.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/sap/src/sap_ch_select.c b/core/sap/src/sap_ch_select.c index 9132827f7719..9e7aabc01787 100644 --- a/core/sap/src/sap_ch_select.c +++ b/core/sap/src/sap_ch_select.c @@ -659,7 +659,7 @@ bool sap_chan_sel_init(tHalHandle halHandle, /* Fill the channel number in the spectrum in the operating freq band */ for (channelnum = 0; channelnum < pSpectInfoParams->numSpectChans; - channelnum++, pChans++) { + channelnum++, pChans++, pSpectCh++) { chSafe = true; /* check if the channel is in NOL blacklist */ @@ -700,7 +700,6 @@ bool sap_chan_sel_init(tHalHandle halHandle, /* OFDM rates are not supported on channel 14 */ if (*pChans == 14 && eCSR_DOT11_MODE_11b != pSapCtx->csr_roamProfile.phyMode) { - pSpectCh++; continue; } @@ -710,7 +709,6 @@ bool sap_chan_sel_init(tHalHandle halHandle, pSpectCh->rssiAgr = SOFTAP_MIN_RSSI; /* Initialise for all channels */ pSpectCh->channelWidth = SOFTAP_HT20_CHANNELWIDTH; /* Initialise 20MHz for all the Channels */ } - pSpectCh++; } return eSAP_TRUE; }