Accept RoC even if sta interface is in connecting state.
In concurrency cert test cases, RoC is rejected by the driver
because the driver is in connecting state for wlan0.
This is leading to failure as the peer device is not able
to discover the DUT.
Accepting the RoC even wlan0 is in connecting state. Driver dont
accept the RoC if p2p device is in connecting state.
Change-Id: Ie7410e26f6ab87624cb470c5551384f4a71579d2
CRs-Fixed: 708333
diff --git a/CORE/HDD/inc/wlan_hdd_main.h b/CORE/HDD/inc/wlan_hdd_main.h
index fcadeb7..90505c5 100644
--- a/CORE/HDD/inc/wlan_hdd_main.h
+++ b/CORE/HDD/inc/wlan_hdd_main.h
@@ -1412,7 +1412,7 @@
v_BOOL_t hdd_is_valid_mac_address(const tANI_U8* pMacAddr);
VOS_STATUS hdd_issta_p2p_clientconnected(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 hdd_isConnectionInProgress( hdd_context_t *pHddCtx, v_BOOL_t isRoC );
#ifdef WLAN_FEATURE_PACKET_FILTERING
int wlan_hdd_setIPv6Filter(hdd_context_t *pHddCtx, tANI_U8 filterType, tANI_U8 sessionId);
#endif
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index f0db5af..9f104e5 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -8950,7 +8950,7 @@
* Go through each adapter and check if Connection is in progress
*
*/
-v_BOOL_t hdd_isConnectionInProgress( hdd_context_t *pHddCtx )
+v_BOOL_t hdd_isConnectionInProgress( hdd_context_t *pHddCtx, v_BOOL_t isRoC )
{
hdd_adapter_list_node_t *pAdapterNode = NULL, *pNext = NULL;
hdd_station_ctx_t *pHddStaCtx = NULL;
@@ -8978,7 +8978,7 @@
"%s: Adapter with device mode %s (%d) exists",
__func__, hdd_device_modetoString(pAdapter->device_mode),
pAdapter->device_mode);
- if (((WLAN_HDD_INFRA_STATION == pAdapter->device_mode) ||
+ if ((((!isRoC) && (WLAN_HDD_INFRA_STATION == pAdapter->device_mode)) ||
(WLAN_HDD_P2P_CLIENT == pAdapter->device_mode) ||
(WLAN_HDD_P2P_DEVICE == pAdapter->device_mode)) &&
(eConnectionState_Connecting ==
@@ -8989,7 +8989,7 @@
WLAN_HDD_GET_STATION_CTX_PTR(pAdapter), pAdapter->sessionId);
return VOS_TRUE;
}
- if ((WLAN_HDD_INFRA_STATION == pAdapter->device_mode) ||
+ if (((!isRoC) && (WLAN_HDD_INFRA_STATION == pAdapter->device_mode)) ||
(WLAN_HDD_P2P_CLIENT == pAdapter->device_mode) ||
(WLAN_HDD_P2P_DEVICE == pAdapter->device_mode))
{
@@ -9170,7 +9170,7 @@
/* Check if scan is allowed at this point of time.
*/
- if (hdd_isConnectionInProgress(pHddCtx))
+ if (hdd_isConnectionInProgress(pHddCtx, VOS_FALSE))
{
hddLog(VOS_TRACE_LEVEL_ERROR, "%s: Scan not allowed", __func__);
return -EBUSY;
diff --git a/CORE/HDD/src/wlan_hdd_p2p.c b/CORE/HDD/src/wlan_hdd_p2p.c
index 149b00d..d42fdc8 100644
--- a/CORE/HDD/src/wlan_hdd_p2p.c
+++ b/CORE/HDD/src/wlan_hdd_p2p.c
@@ -452,7 +452,7 @@
* and which is resulting in crash. So not allowing any remain on
* channel requets when Load/Unload is in progress*/
if (WLAN_HDD_IS_LOAD_UNLOAD_IN_PROGRESS(((hdd_context_t *)pAdapter->pHddCtx))
- || hdd_isConnectionInProgress((hdd_context_t *)pAdapter->pHddCtx))
+ || hdd_isConnectionInProgress((hdd_context_t *)pAdapter->pHddCtx, VOS_TRUE))
{
hddLog( LOGE,
"%s: Wlan Load/Unload or Connection is in progress", __func__);