commit 8ee532daea850fa40b88bf4a1b474cfa339f43b3
author Sudhir Sattayappa Kohalli <c_skoha@qca.qualcomm.com> Fri Feb 15 13:16:26 2013 -0800
committer Gopichand Nakkala <gnakkala@qca.qualcomm.com> Fri Feb 22 16:13:33 2013 -0800
tree 23ea261b9b7bd4575b4c5b71361226c969824919
parent a663bb3c6a31fb6f68fa6310952a341186ca94c9

Fix for Multiple Invitation pop window seen during P2P connection

Multiple Invitation pop-up are seen on the p2p devices, during
p2p-connection, causing p2p connection failure.

Change-Id: I4841d3a7e5717824ebdb7671200096cdb87eef5a
CRs-fixed: 448290

CORE/HDD/inc/wlan_hdd_p2p.h

diff --git a/CORE/HDD/inc/wlan_hdd_p2p.h b/CORE/HDD/inc/wlan_hdd_p2p.h
index b8ad5d5..095a36e 100644
--- a/CORE/HDD/inc/wlan_hdd_p2p.h
+++ b/CORE/HDD/inc/wlan_hdd_p2p.h
@@ -52,7 +52,7 @@
 
 ==========================================================================*/
 #ifdef CONFIG_CFG80211
-#define ACTION_FRAME_TX_TIMEOUT 1000
+#define ACTION_FRAME_TX_TIMEOUT 2000
 #define WAIT_CANCEL_REM_CHAN    1000
 #define WAIT_REM_CHAN_READY     1000
 #define WAIT_CHANGE_CHANNEL_FOR_OFFCHANNEL_TX 3000

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 673a78b..e819633 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -1403,7 +1403,7 @@
                      msecs_to_jiffies(ACTION_FRAME_TX_TIMEOUT));
       if(!rc)
       {
-         VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, 
+         VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
               ("ERROR: HDD Wait for Action Confirmation Failed!!\n"));
       }
    }

CORE/HDD/src/wlan_hdd_p2p.c

diff --git a/CORE/HDD/src/wlan_hdd_p2p.c b/CORE/HDD/src/wlan_hdd_p2p.c
index a030f49..1670ac1 100644
--- a/CORE/HDD/src/wlan_hdd_p2p.c
+++ b/CORE/HDD/src/wlan_hdd_p2p.c
@@ -668,7 +668,20 @@
     }
 
     if( NULL != cfgState->buf )
-        return -EBUSY;
+    {
+        if ( !noack )
+        {
+            hddLog( LOGE, "(%s):Previous P2P Action frame packet pending",
+                          __func__);
+            hdd_cleanup_actionframe(pAdapter->pHddCtx, pAdapter);
+        }
+        else
+        {
+            hddLog( LOGE, "(%s):Pending Action frame packet return EBUSY",
+                          __func__);
+            return -EBUSY;
+        }
+    }
 
     hddLog( LOG1, "Action frame tx request");