wlan: Remove hardcoding SCAN-TYPE to ACTIVE
In connected mode, in csrQueueScanRequest(), scan type is hardcoded
to ACTIVE, because of which PASSIVE scan never happen. So, removing
hardcoding SCAN-TYPE to ACTIVE.
Change-Id: I5eaad96635fac024a086f8ac36333a5be9be1ec4
CRs-Fixed: 639412.
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index aa3fd22..1c27647 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -3474,11 +3474,15 @@
}
else if (strncmp(command, "SCAN-ACTIVE", 11) == 0)
{
- pHddCtx->scan_info.scan_mode = eSIR_ACTIVE_SCAN;
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+ FL("making default scan to ACTIVE"));
+ pHddCtx->scan_info.scan_mode = eSIR_ACTIVE_SCAN;
}
else if (strncmp(command, "SCAN-PASSIVE", 12) == 0)
{
- pHddCtx->scan_info.scan_mode = eSIR_PASSIVE_SCAN;
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+ FL("making default scan to PASSIVE"));
+ pHddCtx->scan_info.scan_mode = eSIR_PASSIVE_SCAN;
}
else if (strncmp(command, "GETDWELLTIME", 12) == 0)
{
@@ -3791,7 +3795,6 @@
hddLog( VOS_TRACE_LEVEL_WARN, "%s: Unsupported GUI command %s",
__func__, command);
}
-
}
exit:
if (command)
diff --git a/CORE/HDD/src/wlan_hdd_wext.c b/CORE/HDD/src/wlan_hdd_wext.c
index 810046a..f14dd32 100644
--- a/CORE/HDD/src/wlan_hdd_wext.c
+++ b/CORE/HDD/src/wlan_hdd_wext.c
@@ -3079,11 +3079,15 @@
}
else if (strcasecmp(cmd, "scan-active") == 0)
{
+ hddLog(VOS_TRACE_LEVEL_ERROR,
+ FL("making default scan to active"));
pHddCtx->scan_info.scan_mode = eSIR_ACTIVE_SCAN;
ret = snprintf(cmd, cmd_len, "OK");
}
else if (strcasecmp(cmd, "scan-passive") == 0)
{
+ hddLog(VOS_TRACE_LEVEL_ERROR,
+ FL("making default scan to passive"));
pHddCtx->scan_info.scan_mode = eSIR_PASSIVE_SCAN;
ret = snprintf(cmd, cmd_len, "OK");
}
diff --git a/CORE/SME/inc/csrApi.h b/CORE/SME/inc/csrApi.h
index cd4c8b6..a3e4f1a 100644
--- a/CORE/SME/inc/csrApi.h
+++ b/CORE/SME/inc/csrApi.h
@@ -282,7 +282,6 @@
eCsrRequestType requestType; //11d scan or full scan
tANI_BOOLEAN p2pSearch;
tANI_BOOLEAN skipDfsChnlInP2pSearch;
- tANI_BOOLEAN bcnRptReqScan; //is Scan issued by Beacon Report Request
}tCsrScanRequest;
typedef struct tagCsrBGScanRequest
diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c
index dd6e3ad..8c37291 100644
--- a/CORE/SME/src/csr/csrApiScan.c
+++ b/CORE/SME/src/csr/csrApiScan.c
@@ -482,9 +482,7 @@
pChnInfo->ChannelList = &channelToScan[0];
scanReq.BSSType = eCSR_BSS_TYPE_ANY;
- //Modify callers parameters in case of concurrency
- if (!pScanCmd->u.scanCmd.u.scanRequest.bcnRptReqScan)
- scanReq.scanType = eSIR_ACTIVE_SCAN;
+
//Use concurrency values for min/maxChnTime.
//We know csrIsAnySessionConnected(pMac) returns TRUE here
csrSetDefaultScanTiming(pMac, scanReq.scanType, &scanReq);
@@ -516,8 +514,7 @@
pSendScanCmd = pScanCmd;
pSendScanCmd->u.scanCmd.u.scanRequest.ChannelInfo.numOfChannels = nNumChanCombinedConc;
pSendScanCmd->u.scanCmd.u.scanRequest.BSSType = eCSR_BSS_TYPE_ANY;
- if (!pSendScanCmd->u.scanCmd.u.scanRequest.bcnRptReqScan)
- pSendScanCmd->u.scanCmd.u.scanRequest.scanType = eSIR_ACTIVE_SCAN;
+
//Use concurrency values for min/maxChnTime.
//We know csrIsAnySessionConnected(pMac) returns TRUE here
csrSetDefaultScanTiming(pMac, pSendScanCmd->u.scanCmd.u.scanRequest.scanType, &pSendScanCmd->u.scanCmd.u.scanRequest);
@@ -525,8 +522,7 @@
} else {
pSendScanCmd = pScanCmd;
pSendScanCmd->u.scanCmd.u.scanRequest.BSSType = eCSR_BSS_TYPE_ANY;
- if (!pSendScanCmd->u.scanCmd.u.scanRequest.bcnRptReqScan)
- pSendScanCmd->u.scanCmd.u.scanRequest.scanType = eSIR_ACTIVE_SCAN;
+
//Use concurrency values for min/maxChnTime.
//We know csrIsAnySessionConnected(pMac) returns TRUE here
csrSetDefaultScanTiming(pMac, pSendScanCmd->u.scanCmd.u.scanRequest.scanType, &pSendScanCmd->u.scanCmd.u.scanRequest);
@@ -790,13 +786,7 @@
if ( csrIs11dSupported(pMac) )
{
- scanReq.bcnRptReqScan = pScanRequest->bcnRptReqScan;
- if (pScanRequest->bcnRptReqScan)
- scanReq.scanType = pScanRequest->scanType ?
- eSIR_PASSIVE_SCAN :
- pScanRequest->scanType;
- else
- scanReq.scanType = eSIR_PASSIVE_SCAN;
+ scanReq.scanType = eSIR_PASSIVE_SCAN;
scanReq.requestType = eCSR_SCAN_REQUEST_11D_SCAN;
p11dScanCmd->u.scanCmd.reason = eCsrScan11d1;
scanReq.maxChnTime = pMac->roam.configParam.nPassiveMaxChnTime;
@@ -804,11 +794,7 @@
}
else
{
- scanReq.bcnRptReqScan = pScanRequest->bcnRptReqScan;
- if (pScanRequest->bcnRptReqScan)
- scanReq.scanType = pScanRequest->scanType;
- else
- scanReq.scanType = eSIR_ACTIVE_SCAN;
+ scanReq.scanType = pScanRequest->scanType;
scanReq.requestType = eCSR_SCAN_IDLE_MODE_SCAN;
p11dScanCmd->u.scanCmd.reason = eCsrScanIdleScan;
scanReq.maxChnTime = pMac->roam.configParam.nActiveMaxChnTime;
@@ -6367,8 +6353,7 @@
pScanCmd->u.scanCmd.u.scanRequest.ChannelInfo.numOfChannels = numChn - nNumChanCombinedConc; //reduce outstanding # of channels to be scanned
scanReq.BSSType = eCSR_BSS_TYPE_ANY;
- //Modify callers parameters in case of concurrency
- scanReq.scanType = eSIR_ACTIVE_SCAN;
+
//Use concurrency values for min/maxChnTime.
//We know csrIsAnySessionConnected(pMac) returns TRUE here
csrSetDefaultScanTiming(pMac, scanReq.scanType, &scanReq);
diff --git a/CORE/SME/src/rrm/sme_rrm.c b/CORE/SME/src/rrm/sme_rrm.c
index 7f8d638..e5cb300 100644
--- a/CORE/SME/src/rrm/sme_rrm.c
+++ b/CORE/SME/src/rrm/sme_rrm.c
@@ -704,7 +704,6 @@
vos_mem_zero( &scanRequest, sizeof(scanRequest));
/* set scanType, active or passive */
- scanRequest.bcnRptReqScan = TRUE;
scanRequest.scanType = scanType;
vos_mem_copy(scanRequest.bssid,