wlan: Defer back to back scan only in connected state.
If dut is in connected state and scan is neither p2p
nor single channel scan, driver will not issue fresh scan.
Driver will return cached scan results if scan time is differ
with nDeferScanTimeInterval.
CRs-Fixed: 767742
Change-Id: Idf9c7e9db70c22aea27611aed3f22086ba568f2e
diff --git a/CORE/HDD/inc/wlan_hdd_main.h b/CORE/HDD/inc/wlan_hdd_main.h
index 2ca4506..c430672 100644
--- a/CORE/HDD/inc/wlan_hdd_main.h
+++ b/CORE/HDD/inc/wlan_hdd_main.h
@@ -1432,6 +1432,7 @@
int wlan_hdd_validate_context(hdd_context_t *pHddCtx);
v_BOOL_t hdd_is_valid_mac_address(const tANI_U8* pMacAddr);
VOS_STATUS hdd_issta_p2p_clientconnected(hdd_context_t *pHddCtx);
+VOS_STATUS hdd_is_any_session_connected(hdd_context_t *pHddCtx);
void hdd_ipv4_notifier_work_queue(struct work_struct *work);
v_BOOL_t hdd_isConnectionInProgress( hdd_context_t *pHddCtx, v_BOOL_t isRoC );
#ifdef WLAN_FEATURE_PACKET_FILTERING
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 1df9d16..317e819 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -9930,31 +9930,36 @@
* This rule is not applicable if scan is p2p scan.
* This condition will work only in case when last request no of channels
* and channels are exactly same as new request.
+ * This should be done only in connected state
*/
- if (pScanInfo->last_scan_timestamp !=0 &&
- (FALSE == request->no_cck) && // no_cck is set during p2p find.
- ((vos_timer_get_system_time() - pScanInfo->last_scan_timestamp ) < pHddCtx->cfg_ini->nDeferScanTimeInterval))
- {
- if (pScanInfo->last_scan_numChannels == scanRequest.ChannelInfo.numOfChannels &&
- vos_mem_compare(pScanInfo->last_scan_channelList,
- channelList, pScanInfo->last_scan_numChannels))
- {
- hddLog(VOS_TRACE_LEVEL_WARN,
- " New and old station scan time differ is less then %u",
- pHddCtx->cfg_ini->nDeferScanTimeInterval);
- ret = wlan_hdd_cfg80211_update_bss((WLAN_HDD_GET_CTX(pAdapter))->wiphy,
+ if ((VOS_STATUS_SUCCESS == hdd_is_any_session_connected(pHddCtx)))
+ {
+ if ( pScanInfo->last_scan_timestamp !=0 &&
+ ((vos_timer_get_system_time() - pScanInfo->last_scan_timestamp ) < pHddCtx->cfg_ini->nDeferScanTimeInterval))
+ {
+ if ( request->no_cck == FALSE && scanRequest.ChannelInfo.numOfChannels != 1 &&
+ (pScanInfo->last_scan_numChannels == scanRequest.ChannelInfo.numOfChannels) &&
+ vos_mem_compare(pScanInfo->last_scan_channelList,
+ channelList, pScanInfo->last_scan_numChannels))
+ {
+ hddLog(VOS_TRACE_LEVEL_WARN,
+ " New and old station scan time differ is less then %u",
+ pHddCtx->cfg_ini->nDeferScanTimeInterval);
+
+ ret = wlan_hdd_cfg80211_update_bss((WLAN_HDD_GET_CTX(pAdapter))->wiphy,
pAdapter);
- hddLog(VOS_TRACE_LEVEL_WARN,
- "Return old cached scan as all channels"
- "and no of channles are same");
- if (0 > ret)
- hddLog(VOS_TRACE_LEVEL_INFO, "%s: NO SCAN result", __func__);
+ hddLog(VOS_TRACE_LEVEL_WARN,
+ "Return old cached scan as all channels"
+ "and no of channles are same");
+ if (0 > ret)
+ hddLog(VOS_TRACE_LEVEL_INFO, "%s: NO SCAN result", __func__);
- cfg80211_scan_done(request, eCSR_SCAN_SUCCESS);
- return eHAL_STATUS_SUCCESS ;
- }
+ cfg80211_scan_done(request, eCSR_SCAN_SUCCESS);
+ return eHAL_STATUS_SUCCESS ;
+ }
+ }
}
/* Flush the scan results(only p2p beacons) for STA scan and P2P
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 8bb7809..785e9c3 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -10643,6 +10643,15 @@
return sme_isSta_p2p_clientConnected(pHddCtx->hHal);
}
+/*
+ * API to find if there is any session connected
+ */
+VOS_STATUS hdd_is_any_session_connected(hdd_context_t *pHddCtx)
+{
+ return sme_is_any_session_connected(pHddCtx->hHal);
+}
+
+
int wlan_hdd_scan_abort(hdd_adapter_t *pAdapter)
{
hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
diff --git a/CORE/SME/inc/sme_Api.h b/CORE/SME/inc/sme_Api.h
index 31b2855..4af65b5 100644
--- a/CORE/SME/inc/sme_Api.h
+++ b/CORE/SME/inc/sme_Api.h
@@ -3303,6 +3303,17 @@
--------------------------------------------------------------------------*/
VOS_STATUS sme_isSta_p2p_clientConnected(tHalHandle hHal);
+/*--------------------------------------------------------------------------
+ \brief hdd_is_any_session_connected() - a wrapper function to check if there
+ is any connected session .
+ This is a synchronous call
+ \param hHal - The handle returned by macOpen
+ \return VOS_STATUS - SME passed the request to CSR successfully.
+ Other status means SME is failed to send the request.
+ \sa
+ --------------------------------------------------------------------------*/
+VOS_STATUS sme_is_any_session_connected(tHalHandle hHal);
+
#ifdef FEATURE_WLAN_LPHB
/* ---------------------------------------------------------------------------
\fn sme_LPHBConfigReq
diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c
index 6719301..edaf0e7 100644
--- a/CORE/SME/src/sme_common/sme_Api.c
+++ b/CORE/SME/src/sme_common/sme_Api.c
@@ -10656,6 +10656,20 @@
return VOS_STATUS_E_FAILURE;
}
+/*
+ * SME API to check if any sessoion connected.
+ */
+VOS_STATUS sme_is_any_session_connected(tHalHandle hHal)
+{
+ tpAniSirGlobal pMac = PMAC_STRUCT( hHal );
+ if(csrIsAnySessionConnected(pMac))
+ {
+
+ return VOS_STATUS_SUCCESS;
+ }
+ return VOS_STATUS_E_FAILURE;
+}
+
#ifdef FEATURE_WLAN_LPHB
/* ---------------------------------------------------------------------------