diff options
| author | Rashmi Ramanna <c_ramanr@qti.qualcomm.com> | 2013-12-20 09:04:12 +0530 |
|---|---|---|
| committer | Prakash Dhavali <pdhavali@qca.qualcomm.com> | 2014-01-26 00:53:54 -0800 |
| commit | 72097efbccdf0fa01d680c556d5987bd09aeb93c (patch) | |
| tree | df5001996a4ef583af7dd392aa2dc7a563620e91 | |
| parent | a3e1f263c1e72e34413f828982063ca116411cbc (diff) | |
P2P: Sanity check for presence of SSID in p2p scan request.
In Change-Id I7d810255a70e5d7e9ae143e094c878f08b2a829d, we
are increasing the dwell time of p2p scan if the p2p scan
is for specific SSID.
There may be chances that some supplicants doesn't trigger
p2p scan for specific SSID or SSIDList is NULL.
This results in kernel panic when p2p scan is issued to
establish p2p connection.
To resolve this issue, the number of SSIDs in scan request
is checked for the presence of SSID in p2p scan request.
Change-Id: I53c7f8a3124ffb9d72301ab2a8c64fade62b871e
CRs-fixed: 591975
| -rw-r--r-- | CORE/SME/src/csr/csrApiScan.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c index 81ca2ecd514f..45e7ccbf25ff 100644 --- a/CORE/SME/src/csr/csrApiScan.c +++ b/CORE/SME/src/csr/csrApiScan.c @@ -729,13 +729,16 @@ eHalStatus csrScanRequest(tpAniSirGlobal pMac, tANI_U16 sessionId, */ if(pScanRequest->p2pSearch) { - //If the scan request is for specific SSId the length of SSID will be - //greater than 7 as SSID for p2p search contains "DIRECT-") - if(pScanRequest->SSIDs.SSIDList->SSID.length > DIRECT_SSID_LEN) + if(pScanRequest->SSIDs.numOfSSIDs) { - smsLog( pMac, LOG1, FL(" Increase the Dwell time to 100ms.")); - pScanRequest->maxChnTime = MAX_CHN_TIME_TO_FIND_GO; - pScanRequest->minChnTime = MIN_CHN_TIME_TO_FIND_GO; + //If the scan request is for specific SSId the length of SSID will be + //greater than 7 as SSID for p2p search contains "DIRECT-") + if(pScanRequest->SSIDs.SSIDList->SSID.length > DIRECT_SSID_LEN) + { + smsLog( pMac, LOG1, FL(" Increase the Dwell time to 100ms.")); + pScanRequest->maxChnTime = MAX_CHN_TIME_TO_FIND_GO; + pScanRequest->minChnTime = MIN_CHN_TIME_TO_FIND_GO; + } } } |