commit b09d3e70fbfeaf1d9d8f1b1ac33deafbd4ce628f
author Vinay Krishna Eranna <c_veran@qti.qualcomm.com> Wed Mar 26 21:23:55 2014 +0530
committer Kiet Lam <c_kietl@qca.qualcomm.com> Mon Mar 31 09:54:13 2014 -0700
tree 5ff6b0fbb5f8d9b6fc79692870b00f51069671b2
parent 37385d727f488b7496629888d2a9cf53418db97f

wlan: Handling different connect states in virtual interface removal

If driver deletes the self interace before cleaning up the
connection it leaves the FW in invalid state after which
scan get stuck with failure response from the FW.

Handling the disconnecting and connecting state when stop
adatper is called.

Change-Id: I0db2b1cb24e599a0e0d4cbe7a330150754e8886e
CRs-Fixed: 620352

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 7737547..c3fff70 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -6583,7 +6583,7 @@
     }
 
     pHddCtx->isAmpAllowed = VOS_TRUE;
-    pHddStaCtx->conn_info.connState = eConnectionState_NotConnected;
+    pHddStaCtx->conn_info.connState = eConnectionState_Disconnecting;
     INIT_COMPLETION(pAdapter->disconnect_comp_var);
 
     /*issue disconnect*/
@@ -6690,7 +6690,6 @@
                     reasonCode = eCSR_DISCONNECT_REASON_UNSPECIFIED;
                     break;
             }
-            pHddStaCtx->conn_info.connState = eConnectionState_NotConnected;
             pScanInfo =  &pHddCtx->scan_info;
             if (pScanInfo->mScanPending)
             {

CORE/HDD/src/wlan_hdd_main.c

diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 5e1a125..b137ab3 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -6298,7 +6298,10 @@
       case WLAN_HDD_INFRA_STATION:
       case WLAN_HDD_P2P_CLIENT:
       case WLAN_HDD_P2P_DEVICE:
-         if( hdd_connIsConnected( WLAN_HDD_GET_STATION_CTX_PTR( pAdapter )) )
+      {
+         hdd_station_ctx_t *pstation = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
+         if( hdd_connIsConnected(pstation) ||
+             (pstation->conn_info.connState == eConnectionState_Connecting) )
          {
             if (pWextState->roamProfile.BSSType == eCSR_BSS_TYPE_START_IBSS)
                 halStatus = sme_RoamDisconnect(pHddCtx->hHal,
@@ -6331,6 +6334,18 @@
             memset(wrqu.ap_addr.sa_data,'\0',ETH_ALEN);
             wireless_send_event(pAdapter->dev, SIOCGIWAP, &wrqu, NULL);
          }
+         else if(pstation->conn_info.connState ==
+                    eConnectionState_Disconnecting)
+         {
+             ret = wait_for_completion_interruptible_timeout(
+                   &pAdapter->disconnect_comp_var,
+                   msecs_to_jiffies(WLAN_WAIT_TIME_DISCONNECT));
+             if (ret <= 0)
+             {
+                 hddLog(VOS_TRACE_LEVEL_ERROR,
+                 FL("wait on disconnect_comp_var failed %ld"), ret);
+             }
+         }
          else
          {
             hdd_abort_mac_scan(pHddCtx, pAdapter->sessionId,
@@ -6376,7 +6391,7 @@
                }
             }
          }
-
+      }
          break;
 
       case WLAN_HDD_SOFTAP: