am 532a21e6: am 2c5b17df: P2P: Improve robustness against lost ctrl::ack
* commit '532a21e653c99b23c904f21f9a31325eca450690':
P2P: Improve robustness against lost ctrl::ack
diff --git a/src/p2p/p2p_go_neg.c b/src/p2p/p2p_go_neg.c
index 3835590..b21d97c 100644
--- a/src/p2p/p2p_go_neg.c
+++ b/src/p2p/p2p_go_neg.c
@@ -1205,5 +1205,17 @@
return;
}
+ /*
+ * The peer could have missed our ctrl::ack frame for GO Negotiation
+ * Confirm and continue retransmitting the frame. To reduce the
+ * likelihood of the peer not getting successful TX status for the
+ * GO Negotiation Confirm frame, wait a short time here before starting
+ * the group so that we will remain on the current channel to
+ * acknowledge any possible retransmission from the peer.
+ */
+ wpa_msg(p2p->cfg->msg_ctx, MSG_DEBUG, "P2P: 20 ms wait on current "
+ "channel before starting group");
+ os_sleep(0, 20000);
+
p2p_go_complete(p2p, dev);
}
diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c
index efc36cd..cd3aa56 100644
--- a/wpa_supplicant/p2p_supplicant.c
+++ b/wpa_supplicant/p2p_supplicant.c
@@ -2391,6 +2391,18 @@
return;
}
+ /*
+ * The peer could have missed our ctrl::ack frame for Invitation
+ * Response and continue retransmitting the frame. To reduce the
+ * likelihood of the peer not getting successful TX status for the
+ * Invitation Response frame, wait a short time here before starting
+ * the persistent group so that we will remain on the current channel to
+ * acknowledge any possible retransmission from the peer.
+ */
+ wpa_dbg(wpa_s, MSG_DEBUG, "P2P: 50 ms wait on current channel before "
+ "starting persistent group");
+ os_sleep(0, 50000);
+
wpas_p2p_group_add_persistent(wpa_s, ssid,
ssid->mode == WPAS_MODE_P2P_GO,
wpa_s->p2p_persistent_go_freq,
