Wlan: Missing Info and Error Logs for scan path in HDD
Adding missing error and info logs for scan path in
wlan_hdd_cfg80211.c
CRs-fixed: 594112
Change-Id: If31c4b6fb7309fa5787a10fe98025205295640d7
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 0666ba1..852cd8e 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -4270,8 +4270,6 @@
struct timespec ts;
#endif
- ENTER();
-
pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
status = wlan_hdd_validate_context(pHddCtx);
@@ -4357,8 +4355,8 @@
}
else
{
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: invalid chan_no %d", __func__, chan_no);
+ hddLog(VOS_TRACE_LEVEL_ERROR, "%s Invalid chan_no:%d",
+ __func__, chan_no);
kfree(mgmt);
return NULL;
}
@@ -4380,7 +4378,7 @@
*/
if(chan == NULL)
{
- hddLog(VOS_TRACE_LEVEL_INFO, "%s chan pointer is NULL", __func__);
+ hddLog(VOS_TRACE_LEVEL_ERROR, "%s chan pointer is NULL", __func__);
kfree(mgmt);
return NULL;
}
@@ -4401,6 +4399,10 @@
rssi = (VOS_MIN ((bss_desc->rssi + bss_desc->sinr), 0))*100;
}
+ hddLog(VOS_TRACE_LEVEL_INFO, "%s: BSSID:" MAC_ADDRESS_STR " Channel:%d"
+ "RSSI:%d", __func__, MAC_ADDR_ARRAY(mgmt->bssid),
+ chan->center_freq, (int)(rssi/100));
+
bss_status = cfg80211_inform_bss_frame(wiphy, chan, mgmt,
frame_len, rssi, GFP_KERNEL);
kfree(mgmt);
@@ -4488,7 +4490,8 @@
/* no scan results */
if (NULL == pResult)
{
- hddLog(VOS_TRACE_LEVEL_INFO, "%s: No scan result", __func__);
+ hddLog(VOS_TRACE_LEVEL_INFO, "%s: No scan result Status %d",
+ __func__, status);
return status;
}
@@ -5024,7 +5027,13 @@
request);
if(status <= 0)
{
- hddLog(VOS_TRACE_LEVEL_INFO, "%s: TDLS Pending %d", __func__, status);
+ if(!status)
+ hddLog(VOS_TRACE_LEVEL_ERROR, "%s: TDLS in progress."
+ "scan rejected %d", __func__, status);
+ else
+ hddLog(VOS_TRACE_LEVEL_ERROR, "%s: TDLS teardown is ongoing %d",
+ __func__, status);
+
return status;
}
#endif
@@ -5037,7 +5046,7 @@
}
if (TRUE == pHddCtx->tmInfo.tmAction.enterImps)
{
- hddLog(VOS_TRACE_LEVEL_WARN,
+ hddLog(VOS_TRACE_LEVEL_ERROR,
"%s: MAX TM Level Scan not allowed", __func__);
mutex_unlock(&pHddCtx->tmInfo.tmOperationLock);
return -EBUSY;
@@ -5081,7 +5090,7 @@
if(NULL == scanRequest.SSIDs.SSIDList)
{
hddLog(VOS_TRACE_LEVEL_ERROR,
- "memory alloc failed SSIDInfo buffer");
+ "%s: memory alloc failed SSIDInfo buffer", __func__);
return -ENOMEM;
}
@@ -5093,7 +5102,7 @@
vos_mem_copy(SsidInfo->SSID.ssId, &request->ssids[j].ssid[0],
SsidInfo->SSID.length);
SsidInfo->SSID.ssId[SsidInfo->SSID.length] = '\0';
- hddLog(VOS_TRACE_LEVEL_INFO_HIGH, "SSID number %d: %s",
+ hddLog(VOS_TRACE_LEVEL_INFO, "SSID number %d: %s",
j, SsidInfo->SSID.ssId);
}
/* set the scan type to active */
@@ -5131,19 +5140,29 @@
/*Right now scanning all the channels */
if( request )
{
+ hddLog(VOS_TRACE_LEVEL_INFO,
+ "No of Scan Channels: %d", request->n_channels);
if( request->n_channels )
{
+ char chList [(request->n_channels*5)+1];
+ int len;
channelList = vos_mem_malloc( request->n_channels );
if( NULL == channelList )
{
hddLog(VOS_TRACE_LEVEL_ERROR,
- "channelList memory alloc failed channelList");
+ "%s: memory alloc failed channelList", __func__);
status = -ENOMEM;
goto free_mem;
}
- for( i = 0 ; i < request->n_channels ; i++ )
+ for( i = 0, len = 0; i < request->n_channels ; i++ )
+ {
channelList[i] = request->channels[i]->hw_value;
+ len += snprintf(chList+len, 5, "%d ", channelList[i]);
+ }
+
+ hddLog(VOS_TRACE_LEVEL_INFO,
+ "Channel-List: %s ", chList);
}
scanRequest.ChannelInfo.numOfChannels = request->n_channels;
@@ -5166,6 +5185,7 @@
if( request->n_channels != WLAN_HDD_P2P_SINGLE_CHANNEL_SCAN )
{
+ hddLog(VOS_TRACE_LEVEL_DEBUG, "Flushing P2P Results");
sme_ScanFlushP2PResult( WLAN_HDD_GET_HAL_CTX(pAdapter),
pAdapter->sessionId );
}
@@ -5270,6 +5290,12 @@
*/
hdd_prevent_suspend();
+ hddLog(VOS_TRACE_LEVEL_INFO_HIGH,
+ "requestType %d, scanType %d, minChnTime %d, maxChnTime %d,"
+ "p2pSearch %d, skipDfsChnlInP2pSearch %d", scanRequest.requestType,
+ scanRequest.scanType, scanRequest.minChnTime, scanRequest.maxChnTime,
+ scanRequest.p2pSearch, scanRequest.skipDfsChnlInP2pSearch);
+
status = sme_ScanRequest( WLAN_HDD_GET_HAL_CTX(pAdapter),
pAdapter->sessionId, &scanRequest, &scanId,
&hdd_cfg80211_scan_done_callback, dev );
@@ -5281,7 +5307,8 @@
complete(&pScanInfo->scan_req_completion_event);
if(eHAL_STATUS_RESOURCES == status)
{
- hddLog(VOS_TRACE_LEVEL_INFO, "%s: HO is in progress.So defer the scan by informing busy",__func__);
+ hddLog(VOS_TRACE_LEVEL_ERROR, "%s: HO is in progress."
+ "So defer the scan by informing busy",__func__);
status = -EBUSY;
} else {
status = -EIO;