commit c65b5ca53309a90fbfe40fce51ee9a6f7845cdeb
author Agarwal Ashish <ashishka@qti.qualcomm.com> Mon Jul 28 21:02:57 2014 +0530
committer Satyanarayana Dash <c_sadash@qti.qualcomm.com> Wed Jul 30 18:36:34 2014 +0530
tree 5b2e59fbfd712aac987fdc907157c7977867d5a0
parent 69ddd0bdfc1542e391941dc99aee3ca943dc63ee

wlan: Fix incorrect Handling of Active Session in Disconnect.

Currently, If any disconnects comes from supplicant while
connection is already in progress; hdd_DisConnectHandler
is decreasing value of active session.
Driver should decrease in case of connected session only.

CRs-Fixed: 700728
Change-Id: Ibee54791088c6ee7f3c4cb841768172fdaa5d805

CORE/HDD/src/wlan_hdd_assoc.c

diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c
index cbdd162..8c00584 100644
--- a/CORE/HDD/src/wlan_hdd_assoc.c
+++ b/CORE/HDD/src/wlan_hdd_assoc.c
@@ -807,6 +807,13 @@
     /* HDD has initiated disconnect, do not send disconnect indication
      * to kernel as it will be handled by __cfg80211_disconnect.
      */
+    /* If only STA mode is on */
+    if((pHddCtx->concurrency_mode <= 1) &&
+       (pHddCtx->no_of_open_sessions[WLAN_HDD_INFRA_STATION] <= 1))
+    {
+        pHddCtx->isAmpAllowed = VOS_TRUE;
+    }
+
     if ( eConnectionState_Disconnecting == pHddStaCtx->conn_info.connState )
     {
        VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
@@ -814,20 +821,17 @@
                    " disconnect indication to kernel"));
        sendDisconInd = FALSE;
     }
-    VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
-                   "%s: Set HDD connState to eConnectionState_Disconnecting",
-                   __func__);
-    hdd_connSetConnectionState( pHddStaCtx, eConnectionState_Disconnecting );
-    /* If only STA mode is on */
-    if((pHddCtx->concurrency_mode <= 1) &&
-       (pHddCtx->no_of_open_sessions[WLAN_HDD_INFRA_STATION] <= 1))
+    else if (eConnectionState_Associated == pHddStaCtx->conn_info.connState)
     {
-        pHddCtx->isAmpAllowed = VOS_TRUE;
+       VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
+                   "%s: Set HDD connState to eConnectionState_Disconnecting from %d ",
+                   __func__, pHddStaCtx->conn_info.connState);
+       hdd_connSetConnectionState( pHddStaCtx, eConnectionState_Disconnecting );
+       wlan_hdd_decr_active_session(pHddCtx, pAdapter->device_mode);
     }
     hdd_clearRoamProfileIe( pAdapter );
 
     hdd_wmm_init( pAdapter );
-    wlan_hdd_decr_active_session(pHddCtx, pAdapter->device_mode);
 
     // indicate 'disconnect' status to wpa_supplicant...
     hdd_SendAssociationEvent(dev,pRoamInfo);

CORE/HDD/src/wlan_hdd_cfg80211.c

diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index b0723e3..6dc3b26 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -10304,6 +10304,15 @@
     }
 
     pHddCtx->isAmpAllowed = VOS_TRUE;
+
+    if (eConnectionState_Associated ==  pHddStaCtx->conn_info.connState)
+    {
+        VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
+                   "%s: Set HDD connState to eConnectionState_Disconnecting",
+                   __func__);
+        wlan_hdd_decr_active_session(pHddCtx, pAdapter->device_mode);
+    }
+
     VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
                    "%s: Set HDD connState to eConnectionState_Disconnecting",
                    __func__);