wlan: Fix P2P GO Negotiation failure issue
Sometimes it is possible for the host to receive the ack for
go negotiation request after the go negotiation confirmation
is sent. So supplicant assumes go negotiation confirmation is
success though it is not and results in connection failure.
To address this, drop the pending ack for the go negotiation
request. so that the supplicant will wait for the ack of the
negotiation confirmation.
CRs-Fixed: 1032185
Change-Id: I54f305319e23b1ffcbd54cc6e7dcc74d39a2e511
diff --git a/CORE/HDD/src/wlan_hdd_p2p.c b/CORE/HDD/src/wlan_hdd_p2p.c
index c33e303..1865ac8 100644
--- a/CORE/HDD/src/wlan_hdd_p2p.c
+++ b/CORE/HDD/src/wlan_hdd_p2p.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -1760,11 +1760,25 @@
cfgState->actionFrmState = HDD_IDLE;
- hddLog( LOG1, "Send Action cnf, actionSendSuccess %d", actionSendSuccess);
if( NULL == cfgState->buf )
{
return;
}
+ if (cfgState->is_go_neg_ack_received)
+ {
+ cfgState->is_go_neg_ack_received = 0;
+ /* Sometimes its possible that host may receive the ack for GO
+ * negotiation req after sending go negotaition confirmation,
+ * in such case drop the ack received for the go negotiation
+ * request, so that supplicant waits for the confirmation ack
+ * from firmware.
+ */
+ hddLog( LOG1, FL("Drop the pending ack received in cfgState->actionFrmState %d"),
+ cfgState->actionFrmState);
+ return;
+ }
+
+ hddLog( LOG1, "Send Action cnf, actionSendSuccess %d", actionSendSuccess);
/* If skb is NULL it means this packet was received on CFG80211 interface
* else it was received on Monitor interface */
@@ -2606,6 +2620,8 @@
{
hddLog(LOG1, "%s: ACK_PENDING and But received RESP for Action frame ",
__func__);
+ cfgState->is_go_neg_ack_received = 1;
+
hdd_sendActionCnf(pAdapter, TRUE);
}
}