P2P: Do not issue ROC request when connection is in progress on adapter
During connection establishment between two p2p peers, the DUT would
receive Provisioning action frames from other P2P peer if the operating
channel selected to establish p2p connection is same as the listen
channel of other p2p peer.
To respond to Provisioning request, supplicant would issue remain on
channel request. If this remain on channel request is issued by driver
at the time of connection in progress with first peer, the cfg80211
thread would get blocked by remain on channel request command resulting
in delay in giving "connect" event to supplicant.
Thus causes connection failure between first two peers.
So do not process remain on channel request when connection on any
adapter is in progress.
CRs-Fixed: 646519
Change-Id: Iadea18e98aefb7906ae202ef80bfaa48764f7cf2
diff --git a/CORE/HDD/inc/wlan_hdd_main.h b/CORE/HDD/inc/wlan_hdd_main.h
index 4f9ccac..335ab8c 100644
--- a/CORE/HDD/inc/wlan_hdd_main.h
+++ b/CORE/HDD/inc/wlan_hdd_main.h
@@ -1372,6 +1372,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 );
#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 181fa25..0a45b27 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -5041,11 +5041,11 @@
}
/*
- * FUNCTION: hdd_isScanAllowed
- * Go through each adapter and check if scan allowed
+ * FUNCTION: hdd_isConnectionInProgress
+ * Go through each adapter and check if Connection is in progress
*
*/
-v_BOOL_t hdd_isScanAllowed( hdd_context_t *pHddCtx )
+v_BOOL_t hdd_isConnectionInProgress( hdd_context_t *pHddCtx )
{
hdd_adapter_list_node_t *pAdapterNode = NULL, *pNext = NULL;
hdd_station_ctx_t *pHddStaCtx = NULL;
@@ -5057,8 +5057,8 @@
if (TRUE == pHddCtx->btCoexModeSet)
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
- FL("BTCoex Mode operation in progress, Do not allow scan"));
- return VOS_FALSE;
+ FL("BTCoex Mode operation in progress"));
+ return VOS_TRUE;
}
status = hdd_get_front_adapter ( pHddCtx, &pAdapterNode );
@@ -5072,6 +5072,17 @@
hddLog(VOS_TRACE_LEVEL_INFO,
"%s: Adapter with device mode %d exists",
__func__, pAdapter->device_mode);
+ if (((WLAN_HDD_INFRA_STATION == pAdapter->device_mode) ||
+ (WLAN_HDD_P2P_CLIENT == pAdapter->device_mode) ||
+ (WLAN_HDD_P2P_DEVICE == pAdapter->device_mode)) &&
+ (eConnectionState_Connecting ==
+ (WLAN_HDD_GET_STATION_CTX_PTR(pAdapter))->conn_info.connState))
+ {
+ hddLog(VOS_TRACE_LEVEL_ERROR,
+ "%s: %p(%d) Connection is in progress", __func__,
+ WLAN_HDD_GET_STATION_CTX_PTR(pAdapter), pAdapter->sessionId);
+ return VOS_TRUE;
+ }
if ((WLAN_HDD_INFRA_STATION == pAdapter->device_mode) ||
(WLAN_HDD_P2P_CLIENT == pAdapter->device_mode) ||
(WLAN_HDD_P2P_DEVICE == pAdapter->device_mode))
@@ -5085,7 +5096,7 @@
"%s: client " MAC_ADDRESS_STR
" is in the middle of WPS/EAPOL exchange.", __func__,
MAC_ADDR_ARRAY(staMac));
- return VOS_FALSE;
+ return VOS_TRUE;
}
}
else if ((WLAN_HDD_SOFTAP == pAdapter->device_mode) ||
@@ -5102,7 +5113,7 @@
"%s: client " MAC_ADDRESS_STR " of SoftAP/P2P-GO is in the "
"middle of WPS/EAPOL exchange.", __func__,
MAC_ADDR_ARRAY(staMac));
- return VOS_FALSE;
+ return VOS_TRUE;
}
}
}
@@ -5110,9 +5121,7 @@
status = hdd_get_next_adapter ( pHddCtx, pAdapterNode, &pNext );
pAdapterNode = pNext;
}
- hddLog(VOS_TRACE_LEVEL_INFO,
- "%s: Scan allowed", __func__);
- return VOS_TRUE;
+ return VOS_FALSE;
}
/*
@@ -5161,16 +5170,6 @@
cfg_param = pHddCtx->cfg_ini;
pScanInfo = &pHddCtx->scan_info;
- if ((WLAN_HDD_INFRA_STATION == pAdapter->device_mode) &&
- (eConnectionState_Connecting ==
- (WLAN_HDD_GET_STATION_CTX_PTR(pAdapter))->conn_info.connState))
- {
- hddLog(VOS_TRACE_LEVEL_ERROR,
- "%s: %p(%d) Connection in progress: Scan request denied (EBUSY)", __func__, \
- WLAN_HDD_GET_STATION_CTX_PTR(pAdapter), pAdapter->sessionId);
- return -EBUSY;
- }
-
#ifdef WLAN_BTAMP_FEATURE
//Scan not supported when AMP traffic is on.
if (VOS_TRUE == WLANBAP_AmpSessionOn())
@@ -5248,7 +5247,7 @@
/* Check if scan is allowed at this point of time.
*/
- if (!hdd_isScanAllowed(pHddCtx))
+ if (hdd_isConnectionInProgress(pHddCtx))
{
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 d84e85b..8392409 100644
--- a/CORE/HDD/src/wlan_hdd_p2p.c
+++ b/CORE/HDD/src/wlan_hdd_p2p.c
@@ -440,10 +440,11 @@
* wlan driver is keep on receiving the remain on channel command
* 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)))
+ if (WLAN_HDD_IS_LOAD_UNLOAD_IN_PROGRESS(((hdd_context_t *)pAdapter->pHddCtx))
+ || hdd_isConnectionInProgress((hdd_context_t *)pAdapter->pHddCtx))
{
hddLog( LOGE,
- "%s: Wlan Load/Unload is in progress", __func__);
+ "%s: Wlan Load/Unload or Connection is in progress", __func__);
return -EBUSY;
}