commit b46384209efa8c6cc551ee6e952499842a9d3bba
author Pervinder Singh <pervinde@qti.qualcomm.com> Mon Mar 04 22:51:36 2013 -0800
committer Gopichand Nakkala <gnakkala@qca.qualcomm.com> Thu Mar 07 14:39:30 2013 -0800
tree 6e2b8007d92cc36544aaa6c12a763accaacfc4b3
parent 775073cee7892c604ef3bd7bbdbb6f3d8d68f1ce

Fix for the false detection of management frame TX completion failed

Correct the check for return value of wait_for_completion routine
if, it is zero then return failure.

CRs-Fixed: 458617
Change-Id: I622c634fbaf5e704c086b3c161834bda42119ea1

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 0094325..890ab1b 100755
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -6725,7 +6725,7 @@
     if (SIR_MAC_TDLS_TEARDOWN == action_code)
     {
        responder = wlan_hdd_tdls_get_responder(peerMac);
-       if(-1 == responder)
+       if (-1 == responder)
        {
             VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
                      "%s: %02x:%02x:%02x:%02x:%02x:%02x) peer doesn't exist dialog_token %d status %d, len = %d",
@@ -6735,7 +6735,7 @@
        }
     }
 
-    if(ret == 0 && /* if failure, don't need to set the progress bit */
+    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(peer, TRUE);
 
@@ -6758,17 +6758,20 @@
     /* not block discovery request, as it is called from timer callback */
     if (SIR_MAC_TDLS_DIS_REQ !=  action_code)
     {
-        status = wait_for_completion_interruptible_timeout(&pAdapter->tdls_mgmt_comp,
+        long rc;
+
+        rc = wait_for_completion_interruptible_timeout(&pAdapter->tdls_mgmt_comp,
                                                             msecs_to_jiffies(WAIT_TIME_TDLS_MGMT));
 
-        if ((VOS_STATUS_SUCCESS != status) || (TRUE != pAdapter->mgmtTxCompletionStatus))
+        if ((rc <= 0) || (TRUE != pAdapter->mgmtTxCompletionStatus))
         {
-            if(ret == 0 && /* if failure, don't need to set the progress bit */
+            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(peer, FALSE);
 
             VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
-                      "%s: Mgmt Tx Completion failed!", __func__);
+                      "%s: Mgmt Tx Completion failed status %ld TxCompletion %lu",
+                      __func__, rc, pAdapter->mgmtTxCompletionStatus);
             return -EPERM;
         }
     }