commit 8b00c637e2aac36d08d84edaab85ada023809e93
author Gopichand Nakkala <gnakkala@qca.qualcomm.com> Fri Mar 08 19:47:52 2013 -0800
committer Gopichand Nakkala <gnakkala@qca.qualcomm.com> Tue Mar 19 18:18:38 2013 -0700
tree cba94acf32c98ca6dc45526c206e4aa26c2a545a
parent 5907c3ebe041181df44eebc912d1eb75fe6b6b48

Fix for link not establishing in multiple peer scenario

Dont send setup indication to supplicant for the peer if, the
status of same peer link is eTDLS_LINK_CONNECTING.

CRs-Fixed: 460926
Change-Id: I5e30d293ac4904ad68d1f715439ac3ad44e693c7

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 36fae0a..11c974d 100755
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -6337,7 +6337,7 @@
         }
     }
 
-    wlan_hdd_tdls_set_connection_progress(pAdapter, mac, TRUE);
+    wlan_hdd_tdls_set_link_status(pAdapter, mac, eTDLS_LINK_CONNECTING);
 
     INIT_COMPLETION(pAdapter->tdls_add_station_comp);
 
@@ -6352,14 +6352,14 @@
         VOS_TRACE(VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL,
                 "%s: timeout waiting for tdls add station indication",
                 __func__);
-        wlan_hdd_tdls_set_connection_progress(pAdapter, mac, FALSE);
+        wlan_hdd_tdls_set_link_status(pAdapter, mac, eTDLS_LINK_IDLE);
         return -EPERM;
     }
     if ( eHAL_STATUS_SUCCESS != pAdapter->tdlsAddStaStatus)
     {
         VOS_TRACE(VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL,
                 "%s: Add Station is unsucessful", __func__);
-        wlan_hdd_tdls_set_connection_progress(pAdapter, mac, FALSE);
+        wlan_hdd_tdls_set_link_status(pAdapter, mac, eTDLS_LINK_IDLE);
         return -EPERM;
     }
 
@@ -6649,7 +6649,7 @@
 
     if (ret == 0 && /* if failure, don't need to set the progress bit */
        (WLAN_IS_TDLS_SETUP_ACTION(action_code)))
-        wlan_hdd_tdls_set_connection_progress(pAdapter, peer, TRUE);
+        wlan_hdd_tdls_set_link_status(pAdapter, peerMac, eTDLS_LINK_CONNECTING);
 
     INIT_COMPLETION(pAdapter->tdls_mgmt_comp);
 
@@ -6660,7 +6660,7 @@
     {
         if(ret == 0 && /* if failure, don't need to set the progress bit */
            (WLAN_IS_TDLS_SETUP_ACTION(action_code)))
-           wlan_hdd_tdls_set_connection_progress(pAdapter, peer, FALSE);
+            wlan_hdd_tdls_set_link_status(pAdapter, peerMac, eTDLS_LINK_IDLE);
 
         VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
                 "%s: sme_SendTdlsMgmtFrame failed!", __func__);
@@ -6679,7 +6679,7 @@
         {
             if (ret == 0 && /* if failure, don't need to set the progress bit */
                (WLAN_IS_TDLS_SETUP_ACTION(action_code)))
-                wlan_hdd_tdls_set_connection_progress(pAdapter, peer, FALSE);
+                wlan_hdd_tdls_set_link_status(pAdapter, peerMac, eTDLS_LINK_IDLE);
 
             VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
                       "%s: Mgmt Tx Completion failed status %ld TxCompletion %lu",
@@ -6779,9 +6779,8 @@
                         /* start TDLS client registration with TL */
                         status = hdd_roamRegisterTDLSSTA( pAdapter, peer, pTdlsPeer->staId, pTdlsPeer->signature);
                         wlan_hdd_tdls_increment_peer_count(pAdapter);
-                        wlan_hdd_tdls_set_link_status(pTdlsPeer, eTDLS_LINK_CONNECTED);
+                        wlan_hdd_tdls_set_peer_link_status(pTdlsPeer, eTDLS_LINK_CONNECTED);
                         wlan_hdd_tdls_check_bmps(pAdapter);
-                        wlan_hdd_tdls_set_connection_progress(pAdapter, peer, FALSE);
                     }
 
                 } else {
@@ -6797,8 +6796,7 @@
                 {
                     sme_DeleteTdlsPeerSta( WLAN_HDD_GET_HAL_CTX(pAdapter),
                             pAdapter->sessionId, peer );
-                    wlan_hdd_tdls_set_link_status(curr_peer, eTDLS_LINK_IDLE);
-                    curr_peer->isTDLSInProgress = FALSE;
+                    wlan_hdd_tdls_set_peer_link_status(curr_peer, eTDLS_LINK_IDLE);
                 }
                 else
                 {