wlan: Incorrect debug comments fixed
Change-Id: I3d48b21f2bb7fbd055d0fa754bcbd04b0bc90474
CR-Fixed: NA
diff --git a/CORE/SME/src/csr/csrNeighborRoam.c b/CORE/SME/src/csr/csrNeighborRoam.c
index ca5f51d..8d74586 100644
--- a/CORE/SME/src/csr/csrNeighborRoam.c
+++ b/CORE/SME/src/csr/csrNeighborRoam.c
@@ -1689,7 +1689,7 @@
/* ---------------------------------------------------------------------------
- \fn csrNeighborRoamMergeChannelLists
+ \fn csrNeighborRoamMergeChannelLists
\brief This function is used to merge two channel list.
NB: If called with outputNumOfChannels == 0, this routines
@@ -1705,13 +1705,13 @@
\return VOS_STATUS_SUCCESS on success, corresponding error code otherwise
---------------------------------------------------------------------------*/
-VOS_STATUS csrNeighborRoamMergeChannelLists(
- tpAniSirGlobal pMac,
- tANI_U8 *pInputChannelList,
+VOS_STATUS csrNeighborRoamMergeChannelLists(
+ tpAniSirGlobal pMac,
+ tANI_U8 *pInputChannelList,
int inputNumOfChannels,
tANI_U8 *pOutputChannelList,
int outputNumOfChannels,
- int *pMergedOutputNumOfChannels
+ int *pMergedOutputNumOfChannels
)
{
int i = 0;
@@ -1736,17 +1736,17 @@
{
if (pInputChannelList[i])
{
- VOS_TRACE (VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
- "%s: [INFOLOG] Adding extra %d to Neighbor channel list\n", __func__,
- pInputChannelList[i]);
- pOutputChannelList[numChannels] = pInputChannelList[i];
- numChannels++;
+ VOS_TRACE (VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
+ "%s: [INFOLOG] Adding extra %d to Neighbor channel list\n", __func__,
+ pInputChannelList[i]);
+ pOutputChannelList[numChannels] = pInputChannelList[i];
+ numChannels++;
}
}
}
// Return final number of channels
- *pMergedOutputNumOfChannels = numChannels;
+ *pMergedOutputNumOfChannels = numChannels;
return eHAL_STATUS_SUCCESS;
}
@@ -1822,13 +1822,13 @@
{
#if 0
// Before we free the existing channel list for a safety net make sure
- // we have a union of the IAPP and the already existing list.
- status = csrNeighborRoamMergeChannelLists(
- pMac,
- pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo.ChannelList,
- pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo.numOfChannels,
- channelList,
- numChannels,
+ // we have a union of the IAPP and the already existing list.
+ status = csrNeighborRoamMergeChannelLists(
+ pMac,
+ pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo.ChannelList,
+ pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo.numOfChannels,
+ channelList,
+ numChannels,
&numChannels );
#endif
@@ -1960,9 +1960,9 @@
#endif /* WLAN_FEATURE_VOWIFI_11R */
-#ifdef FEATURE_WLAN_LFR
-tANI_BOOLEAN csrNeighborRoamIsSsidCandidateMatch(
- tpAniSirGlobal pMac,
+#ifdef FEATURE_WLAN_LFR
+tANI_BOOLEAN csrNeighborRoamIsSsidCandidateMatch(
+ tpAniSirGlobal pMac,
tDot11fBeaconIEs *pIes)
{
tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo;
@@ -1972,26 +1972,26 @@
if( !(pMac->roam.roamSession
&& CSR_IS_SESSION_VALID(pMac, sessionId)))
- return TRUE; // Treat missing information as a match for everything.
+ return TRUE; // Treat missing information as a match for everything.
pCurProfile = &pMac->roam.roamSession[sessionId].connectedProfile;
if( !pCurProfile)
- return TRUE; // Treat missing information as a match for everything.
+ return TRUE; // Treat missing information as a match for everything.
if( pIes )
{
if(pIes->SSID.present)
{
- fMatch = csrIsSsidMatch( pMac, (void *)pCurProfile->SSID.ssId, pCurProfile->SSID.length,
- pIes->SSID.ssid, pIes->SSID.num_ssid,
+ fMatch = csrIsSsidMatch( pMac, (void *)pCurProfile->SSID.ssId, pCurProfile->SSID.length,
+ pIes->SSID.ssid, pIes->SSID.num_ssid,
eANI_BOOLEAN_TRUE ); // Treat a missing SSID as a non-match.
// Return the result of the match operation
- return fMatch;
+ return fMatch;
} else
return FALSE; // Treat a missing SSID as a non-match.
} else
- return FALSE; // Again, treat missing SSID information as a non-match.
+ return FALSE; // Again, treat missing SSID information as a non-match.
}
/* ---------------------------------------------------------------------------
@@ -2002,7 +2002,7 @@
scan. It uses the information learned from previous scans to re-order the
scan channel list to "favor" the "occupied channels". The actual algorithm
is to scan the current set of "occupied channels" first, for every BG scan,
- followed by a "chunk" of the remaining list of "valid channels".
+ followed by a "chunk" of the remaining list of "valid channels".
\param pMac - The handle returned by macOpen.
\param pInputChannelList - The default channels list.
@@ -2013,12 +2013,12 @@
\return VOS_STATUS_SUCCESS on success, corresponding error code otherwise
---------------------------------------------------------------------------*/
-VOS_STATUS csrNeighborRoamReorderChannelList(
- tpAniSirGlobal pMac,
- tANI_U8 *pInputChannelList,
+VOS_STATUS csrNeighborRoamReorderChannelList(
+ tpAniSirGlobal pMac,
+ tANI_U8 *pInputChannelList,
int numOfChannels,
tANI_U8 *pOutputChannelList,
- int *pOutputNumOfChannels
+ int *pOutputNumOfChannels
)
{
int i = 0;
@@ -2032,9 +2032,9 @@
// Copy over the "occupied channels" at the FRONT of pOutputChannelList.
for (i = 0; i < numOccupiedChannels; i++)
{
- if (pOccupiedChannelList[i] != 0)
+ if (pOccupiedChannelList[i] != 0)
{
- pOutputChannelList[i] = pOccupiedChannelList[i];
+ pOutputChannelList[i] = pOccupiedChannelList[i];
outputNumOfChannels++;
}
}
@@ -2042,22 +2042,22 @@
// Copy over one "chunk" of channels from the "rest of the channels"...append them to the END of pOutputChannelList.
for (j = 0; j < CSR_BG_SCAN_VALID_CHANNEL_LIST_CHUNK_SIZE; j++)
{
- if (!csrIsChannelPresentInList(pOccupiedChannelList, numOccupiedChannels, pInputChannelList[j+index % numOfChannels]))
+ if (!csrIsChannelPresentInList(pOccupiedChannelList, numOccupiedChannels, pInputChannelList[j+index % numOfChannels]))
{
- pOutputChannelList[i] = pInputChannelList[j+index % numOfChannels];
+ pOutputChannelList[i] = pInputChannelList[j+index % numOfChannels];
i++;
outputNumOfChannels++;
}
}
//Let's update the index...at which we start retrieving the next chunk
- index = (index + CSR_BG_SCAN_VALID_CHANNEL_LIST_CHUNK_SIZE) % numOfChannels;
+ index = (index + CSR_BG_SCAN_VALID_CHANNEL_LIST_CHUNK_SIZE) % numOfChannels;
//VOS_ASSERT(numOfChannels == i);
smsLog(pMac, LOGE, FL("numOfChannels in the default channels list=%d. Number in the final list=%d."), numOfChannels, i);
// Return the number of channels
- *pOutputNumOfChannels = outputNumOfChannels;
+ *pOutputNumOfChannels = outputNumOfChannels;
return eHAL_STATUS_SUCCESS;
}
@@ -2113,33 +2113,33 @@
{
// Copy the "default valid channel list" (channelList) from the gNeighborScanChannelList in "cfg.ini".
NEIGHBOR_ROAM_DEBUG(pMac, LOGE, "Using the channel list from cfg.ini");
- status = csrNeighborRoamMergeChannelLists(
- pMac,
- pNeighborRoamInfo->cfgParams.channelInfo.ChannelList,
- pNeighborRoamInfo->cfgParams.channelInfo.numOfChannels,
- channelList,
+ status = csrNeighborRoamMergeChannelLists(
+ pMac,
+ pNeighborRoamInfo->cfgParams.channelInfo.ChannelList,
+ pNeighborRoamInfo->cfgParams.channelInfo.numOfChannels,
+ channelList,
0, //NB: If 0, simply copy the input channel list to the output list.
&numOfChannels );
- }
+ }
else
- {
+ {
/* Get current list of valid channels. */
NEIGHBOR_ROAM_DEBUG(pMac, LOGE, "Switching to master list of valid channels");
numOfChannels = sizeof(pMac->roam.validChannelList);
if(HAL_STATUS_SUCCESS(csrGetCfgValidChannels(pMac, (tANI_U8 *)pMac->roam.validChannelList, (tANI_U32 *) &numOfChannels)))
{
// Copy the "default valid channel list" (channelList) from the actual "valid channel list" information formed by CSR
- status = csrNeighborRoamMergeChannelLists(
- pMac,
- (tANI_U8 *)pMac->roam.validChannelList,
- numOfChannels, // The number of channels in the validChannelList
- channelList,
+ status = csrNeighborRoamMergeChannelLists(
+ pMac,
+ (tANI_U8 *)pMac->roam.validChannelList,
+ numOfChannels, // The number of channels in the validChannelList
+ channelList,
0, //NB: If 0, simply copy the input channel list to the output list.
&numOfChannels ); // The final number of channels in the output list. Will be numOfChannels
}
else
- {
- smsLog(pMac, LOGE, FL("Could not get valid channel list, TL event ignored"));
+ {
+ smsLog(pMac, LOGE, FL("Could not get valid channel list, TL event ignored"));
return VOS_STATUS_E_FAILURE;
}
}
@@ -2147,18 +2147,18 @@
/* At this point, channelList contains our best inputs on the "valid channel list" */
/* Allocate for the maximum number that might be used */
- smsLog(pMac, LOGE, FL("%d channels in the default list. Add %d occupied channels. %d is the MAX scan channel list."),
- numOfChannels,
- CSR_BG_SCAN_OCCUPIED_CHANNEL_LIST_LEN,
+ smsLog(pMac, LOGE, FL("%d channels in the default list. Add %d occupied channels. %d is the MAX scan channel list."),
+ numOfChannels,
+ CSR_BG_SCAN_OCCUPIED_CHANNEL_LIST_LEN,
numOfChannels+CSR_BG_SCAN_OCCUPIED_CHANNEL_LIST_LEN );
pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo.numOfChannels = numOfChannels;
VOS_ASSERT( pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo.ChannelList == NULL);
if (numOfChannels)
{
- pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo.ChannelList =
+ pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo.ChannelList =
vos_mem_malloc(numOfChannels+CSR_BG_SCAN_OCCUPIED_CHANNEL_LIST_LEN );
}
-
+
if (NULL == pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo.ChannelList)
{
smsLog(pMac, LOGE, FL("Memory allocation for Channel list failed.. TL event ignored"));
@@ -2167,26 +2167,26 @@
#ifdef FEATURE_WLAN_LFR
/* Since this is a legacy case, copy the channel list from CFG here */
-
- status = csrNeighborRoamReorderChannelList( pMac,
- channelList,
- numOfChannels,
- pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo.ChannelList,
+
+ status = csrNeighborRoamReorderChannelList( pMac,
+ channelList,
+ numOfChannels,
+ pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo.ChannelList,
&numOfChannels );
if (eHAL_STATUS_SUCCESS != status)
#endif
{
/* Re-ordering failed. */
smsLog(pMac, LOGE, FL("Cannot re-order scan channel list. (status = %d) Going to use default scan channel list."), status);
- vos_mem_copy(pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo.ChannelList,
- channelList, numOfChannels * sizeof(tANI_U8));
- }
+ vos_mem_copy(pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo.ChannelList,
+ channelList, numOfChannels * sizeof(tANI_U8));
+ }
/* Adjust for the actual number that are used */
pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo.numOfChannels = numOfChannels;
for (i = 0; i < pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo.numOfChannels; i++)
{
- NEIGHBOR_ROAM_DEBUG(pMac, LOGE, "Channel List from CFG (or scan caching) = %d\n",
+ NEIGHBOR_ROAM_DEBUG(pMac, LOGE, "Channel List from CFG (or scan caching) = %d\n",
pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo.ChannelList[i]);
}
}
@@ -2260,7 +2260,7 @@
if(!VOS_IS_STATUS_SUCCESS(vosStatus))
{
//err msg
- smsLog(pMac, LOGW, FL(" Couldn't Deregister csrNeighborRoamNeighborLookupCallback UP event from TL: Status = %d\n"), vosStatus);
+ smsLog(pMac, LOGW, FL(" Couldn't Deregister csrNeighborRoamNeighborLookupCallback DOWN event from TL: Status = %d\n"), vosStatus);
}
NEIGHBOR_ROAM_DEBUG(pMac, LOG2, FL("Deregistering DOWN event reassoc callback with TL. RSSI = %d"), pNeighborRoamInfo->cfgParams.neighborReassocThreshold * (-1));
@@ -2341,7 +2341,7 @@
if(!VOS_IS_STATUS_SUCCESS(vosStatus))
{
//err msg
- smsLog(pMac, LOGW, FL(" Couldn't Deregister csrNeighborRoamNeighborLookupCallback DOWN event from TL: Status = %d\n"), status);
+ smsLog(pMac, LOGW, FL(" Couldn't Deregister csrNeighborRoamNeighborLookupCallback DOWN event from TL: Status = %d\n"), vosStatus);
}