prima: Fix to block p2pProcessRemainOnChannelCmd during roaming
Currently, p2pProcessRemainOnChannelCmd is getting invoked during
reassociation which is affecting EAPOL exchanges as NULL packets
are seen before EAPOL exchanges and causing disconnection.Fix this
by not allowing p2pProcessRemainOnChannelCmd during reassociation.
Change-Id: I263cac2e489a096a9b463c2c598b06e41fb56b3d
CRs-Fixed: 777263
diff --git a/CORE/HDD/inc/wlan_hdd_main.h b/CORE/HDD/inc/wlan_hdd_main.h
index 6e433ad..e8d24e8 100644
--- a/CORE/HDD/inc/wlan_hdd_main.h
+++ b/CORE/HDD/inc/wlan_hdd_main.h
@@ -1429,7 +1429,7 @@
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 );
+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 da8ebb2..154136d 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -9715,7 +9715,7 @@
* Go through each adapter and check if Connection is in progress
*
*/
-v_BOOL_t hdd_isConnectionInProgress( hdd_context_t *pHddCtx, v_BOOL_t isRoC )
+v_BOOL_t hdd_isConnectionInProgress( hdd_context_t *pHddCtx)
{
hdd_adapter_list_node_t *pAdapterNode = NULL, *pNext = NULL;
hdd_station_ctx_t *pHddStaCtx = NULL;
@@ -9743,7 +9743,7 @@
"%s: Adapter with device mode %s (%d) exists",
__func__, hdd_device_modetoString(pAdapter->device_mode),
pAdapter->device_mode);
- if ((((!isRoC) && (WLAN_HDD_INFRA_STATION == 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 ==
@@ -9754,7 +9754,15 @@
WLAN_HDD_GET_STATION_CTX_PTR(pAdapter), pAdapter->sessionId);
return VOS_TRUE;
}
- if (((!isRoC) && (WLAN_HDD_INFRA_STATION == pAdapter->device_mode)) ||
+ if ((WLAN_HDD_INFRA_STATION == pAdapter->device_mode) &&
+ smeNeighborRoamIsHandoffInProgress(WLAN_HDD_GET_HAL_CTX(pAdapter)))
+ {
+ hddLog(VOS_TRACE_LEVEL_ERROR,
+ "%s: %p(%d) Reassociation 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))
{
@@ -9944,7 +9952,7 @@
/* Check if scan is allowed at this point of time.
*/
- if (hdd_isConnectionInProgress(pHddCtx, VOS_FALSE))
+ 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 50f9a54..4257539 100644
--- a/CORE/HDD/src/wlan_hdd_p2p.c
+++ b/CORE/HDD/src/wlan_hdd_p2p.c
@@ -594,7 +594,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, VOS_TRUE))
+ || hdd_isConnectionInProgress((hdd_context_t *)pAdapter->pHddCtx))
{
hddLog( LOGE,
"%s: Wlan Load/Unload or Connection is in progress", __func__);
diff --git a/CORE/SME/inc/sme_Api.h b/CORE/SME/inc/sme_Api.h
index 97dadc5..ed100bf 100644
--- a/CORE/SME/inc/sme_Api.h
+++ b/CORE/SME/inc/sme_Api.h
@@ -3518,4 +3518,16 @@
void (*pCallbackfn)(void *pAdapter, int)
);
+/* ---------------------------------------------------------------------------
+ \fn smeNeighborRoamIsHandoffInProgress
+
+ \brief This function is a wrapper to call csrNeighborRoamIsHandoffInProgress
+
+ \param hHal - The handle returned by macOpen.
+
+ \return eANI_BOOLEAN_TRUE if reassoc in progress,
+ eANI_BOOLEAN_FALSE otherwise
+---------------------------------------------------------------------------*/
+tANI_BOOLEAN smeNeighborRoamIsHandoffInProgress(tHalHandle hHal);
+
#endif //#if !defined( __SME_API_H )
diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c
index 54780a4..aec91a2 100644
--- a/CORE/SME/src/sme_common/sme_Api.c
+++ b/CORE/SME/src/sme_common/sme_Api.c
@@ -12017,3 +12017,19 @@
}
return(status);
}
+
+/* ---------------------------------------------------------------------------
+
+ \fn smeNeighborRoamIsHandoffInProgress
+
+ \brief This function is a wrapper to call csrNeighborRoamIsHandoffInProgress
+
+ \param hHal - The handle returned by macOpen.
+
+ \return eANI_BOOLEAN_TRUE if reassoc in progress, eANI_BOOLEAN_FALSE otherwise
+
+---------------------------------------------------------------------------*/
+tANI_BOOLEAN smeNeighborRoamIsHandoffInProgress(tHalHandle hHal)
+{
+ return (csrNeighborRoamIsHandoffInProgress(PMAC_STRUCT(hHal)));
+}