wlan: reset sme state for clients which are not yet connected
If firmware crashes then check the client state and depending
on its connection state use the correct api to notify cfg80211
that the client is no longer connected to the AP so that client
can reconnect to the AP when driver is re-initialized
CRs-Fixed: 500278
Change-Id: Ic0df696039ce9bd893154b143a16aba64a05aa3b
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 93ed12b..9f565d4 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -4108,11 +4108,6 @@
netif_tx_disable(pAdapter->dev);
netif_carrier_off(pAdapter->dev);
- //Record whether STA is associated
- pAdapter->sessionCtx.station.bSendDisconnect =
- hdd_connIsConnected( WLAN_HDD_GET_STATION_CTX_PTR( pAdapter )) ?
- VOS_TRUE : VOS_FALSE;
-
hdd_deinit_tx_rx(pAdapter);
hdd_wmm_adapter_close(pAdapter);
@@ -4131,6 +4126,7 @@
VOS_STATUS status;
hdd_adapter_t *pAdapter;
v_MACADDR_t bcastMac = VOS_MAC_ADDR_BROADCAST_INITIALIZER;
+ eConnectionState connState;
ENTER();
@@ -4145,6 +4141,9 @@
case WLAN_HDD_INFRA_STATION:
case WLAN_HDD_P2P_CLIENT:
case WLAN_HDD_P2P_DEVICE:
+
+ connState = (WLAN_HDD_GET_STATION_CTX_PTR(pAdapter))->conn_info.connState;
+
hdd_init_station_mode(pAdapter);
/* Open the gates for HDD to receive Wext commands */
pAdapter->isLinkUpSvcNeeded = FALSE;
@@ -4155,19 +4154,30 @@
hdd_wlan_initial_scan(pAdapter);
//Indicate disconnect event to supplicant if associated previously
- if(pAdapter->sessionCtx.station.bSendDisconnect)
+ if (eConnectionState_Associated == connState ||
+ eConnectionState_IbssConnected == connState )
{
union iwreq_data wrqu;
memset(&wrqu, '\0', sizeof(wrqu));
wrqu.ap_addr.sa_family = ARPHRD_ETHER;
memset(wrqu.ap_addr.sa_data,'\0',ETH_ALEN);
wireless_send_event(pAdapter->dev, SIOCGIWAP, &wrqu, NULL);
- pAdapter->sessionCtx.station.bSendDisconnect = VOS_FALSE;
/* indicate disconnected event to nl80211 */
cfg80211_disconnected(pAdapter->dev, WLAN_REASON_UNSPECIFIED,
NULL, 0, GFP_KERNEL);
}
+ else if (eConnectionState_Connecting == connState)
+ {
+ /*
+ * Indicate connect failure to supplicant if we were in the
+ * process of connecting
+ */
+ cfg80211_connect_result(pAdapter->dev, NULL,
+ NULL, 0, NULL, 0,
+ WLAN_STATUS_ASSOC_DENIED_UNSPEC,
+ GFP_KERNEL);
+ }
break;
case WLAN_HDD_SOFTAP: