wlan: VOS ASSERT during random connection test
On connect request driver update the HDD context roamprofile
even before it tries to disconnect the current connection and
proceeds with the connect request even when it did not receive
the disconnect event, which results in CSR and HDD connect
state mismatch during connection events handling.
On receiving connect request try disconnecting before updating
any state and roamprofile. If failed to disconnect on current
connection return failure without continuing with the connect
request.
Change-Id: I979b9803441efbee235226ba437db4ee7434591a
CRs-Fixed: 592565
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 85f8042..a148e15 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -5183,7 +5183,6 @@
hdd_wext_state_t *pWextState;
v_U32_t roamId;
tCsrRoamProfile *pRoamProfile;
- eMib_dot11DesiredBssType connectedBssType;
eCsrAuthType RSNAuthType;
ENTER();
@@ -5200,41 +5199,8 @@
if (pRoamProfile)
{
- int ret = 0;
hdd_station_ctx_t *pHddStaCtx;
pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
- hdd_connGetConnectedBssType(pHddStaCtx,&connectedBssType );
-
- if((eMib_dot11DesiredBssType_independent == connectedBssType) ||
- (eConnectionState_Associated == pHddStaCtx->conn_info.connState) ||
- (eConnectionState_IbssConnected == pHddStaCtx->conn_info.connState))
- {
- /* Issue disconnect to CSR */
- INIT_COMPLETION(pAdapter->disconnect_comp_var);
- if( eHAL_STATUS_SUCCESS ==
- sme_RoamDisconnect( WLAN_HDD_GET_HAL_CTX(pAdapter),
- pAdapter->sessionId,
- eCSR_DISCONNECT_REASON_UNSPECIFIED ) )
- {
- ret = wait_for_completion_interruptible_timeout(
- &pAdapter->disconnect_comp_var,
- msecs_to_jiffies(WLAN_WAIT_TIME_DISCONNECT));
- if (0 == ret)
- {
- VOS_ASSERT(0);
- }
- }
- }
- else if(eConnectionState_Disconnecting == pHddStaCtx->conn_info.connState)
- {
- ret = wait_for_completion_interruptible_timeout(
- &pAdapter->disconnect_comp_var,
- msecs_to_jiffies(WLAN_WAIT_TIME_DISCONNECT));
- if (0 == ret)
- {
- VOS_ASSERT(0);
- }
- }
if (HDD_WMM_USER_MODE_NO_QOS ==
(WLAN_HDD_GET_CTX(pAdapter))->cfg_ini->WmmMode)
@@ -6094,6 +6060,57 @@
}
/*
+ * FUNCTION: wlan_hdd_try_disconnect
+ * This function is used to disconnect from previous
+ * connection
+ */
+static int wlan_hdd_try_disconnect( hdd_adapter_t *pAdapter )
+{
+ long ret = 0;
+ hdd_station_ctx_t *pHddStaCtx;
+ eMib_dot11DesiredBssType connectedBssType;
+
+ pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
+
+ hdd_connGetConnectedBssType(pHddStaCtx,&connectedBssType );
+
+ if((eMib_dot11DesiredBssType_independent == connectedBssType) ||
+ (eConnectionState_Associated == pHddStaCtx->conn_info.connState) ||
+ (eConnectionState_IbssConnected == pHddStaCtx->conn_info.connState))
+ {
+ /* Issue disconnect to CSR */
+ INIT_COMPLETION(pAdapter->disconnect_comp_var);
+ if( eHAL_STATUS_SUCCESS ==
+ sme_RoamDisconnect( WLAN_HDD_GET_HAL_CTX(pAdapter),
+ pAdapter->sessionId,
+ eCSR_DISCONNECT_REASON_UNSPECIFIED ) )
+ {
+ ret = wait_for_completion_interruptible_timeout(
+ &pAdapter->disconnect_comp_var,
+ msecs_to_jiffies(WLAN_WAIT_TIME_DISCONNECT));
+ if (0 >= ret)
+ {
+ hddLog(LOGE, FL("Failed to receive disconnect event"));
+ return -EALREADY;
+ }
+ }
+ }
+ else if(eConnectionState_Disconnecting == pHddStaCtx->conn_info.connState)
+ {
+ ret = wait_for_completion_interruptible_timeout(
+ &pAdapter->disconnect_comp_var,
+ msecs_to_jiffies(WLAN_WAIT_TIME_DISCONNECT));
+ if (0 >= ret)
+ {
+ hddLog(LOGE, FL("Failed to receive disconnect event"));
+ return -EALREADY;
+ }
+ }
+
+ return 0;
+}
+
+/*
* FUNCTION: wlan_hdd_cfg80211_set_privacy
* This function is used to initialize the security
* parameters during connect operation.
@@ -6132,6 +6149,24 @@
return -ECONNREFUSED;
}
#endif
+
+ //If Device Mode is Station Concurrent Sessions Exit BMps
+ //P2P Mode will be taken care in Open/close adapter
+ if((WLAN_HDD_INFRA_STATION == pAdapter->device_mode) &&
+ (vos_concurrent_sessions_running()))
+ {
+ exitbmpsStatus = hdd_disable_bmps_imps(pHddCtx, WLAN_HDD_INFRA_STATION);
+ }
+
+ /*Try disconnecting if already in connected state*/
+ status = wlan_hdd_try_disconnect(pAdapter);
+ if ( 0 > status)
+ {
+ hddLog(VOS_TRACE_LEVEL_ERROR, FL("Failed to disconnect the existing"
+ " connection"));
+ return -EALREADY;
+ }
+
/*initialise security parameters*/
status = wlan_hdd_cfg80211_set_privacy(pAdapter, req);
@@ -6142,14 +6177,6 @@
return status;
}
- //If Device Mode is Station Concurrent Sessions Exit BMps
- //P2P Mode will be taken care in Open/close adapter
- if((WLAN_HDD_INFRA_STATION == pAdapter->device_mode) &&
- (vos_concurrent_sessions_running()))
- {
- exitbmpsStatus = hdd_disable_bmps_imps(pHddCtx, WLAN_HDD_INFRA_STATION);
- }
-
if ( req->channel )
{
status = wlan_hdd_cfg80211_connect_start(pAdapter, req->ssid,
@@ -6474,6 +6501,15 @@
return -EIO;
}
+ /*Try disconnecting if already in connected state*/
+ status = wlan_hdd_try_disconnect(pAdapter);
+ if ( 0 > status)
+ {
+ hddLog(VOS_TRACE_LEVEL_ERROR, FL("Failed to disconnect the existing"
+ " IBSS connection"));
+ return -EALREADY;
+ }
+
pRoamProfile = &pWextState->roamProfile;
if ( eCSR_BSS_TYPE_START_IBSS != pRoamProfile->BSSType )