brcmfmac: Add P2P Action Frame retry delay to fix GAS Comeback Response failure issue

It was observed that P2P Cert. 5.1.19: DEVUT responds to Service
Discovery request failed due to DUT did not send GAS Comeback Response
after receiving request from test bed P2P peer. To fix this issue,
we need to add P2P Action Frame retry delay to enhance P2P connection
under VSDB and noisy environment, since the peer can be in other
channels under VSDB.

Signed-off-by: Justin Li <Justin.Li@cypress.com>
Signed-off-by: Chi-hsien Lin <chi-hsien.lin@cypress.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/1588572453-194663-4-git-send-email-wright.feng@cypress.com

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
index 733c98f6ef86c7ed0cce2e1ffffcdb2d49311ad9..e32c24a2670dda131c209c495951e88af04b292f 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
@@ -66,6 +66,7 @@
 #define P2P_CHANNEL_SYNC_RETRY         5
 #define P2P_AF_FRM_SCAN_MAX_WAIT       msecs_to_jiffies(450)
 #define P2P_DEFAULT_SLEEP_TIME_VSDB    200
+#define P2P_AF_RETRY_DELAY_TIME                40
 
 /* WiFi P2P Public Action Frame OUI Subtypes */
 #define P2P_PAF_GON_REQ                0       /* Group Owner Negotiation Req */
@@ -1827,6 +1828,9 @@ bool brcmf_p2p_send_action_frame(struct brcmf_cfg80211_info *cfg,
        while (!p2p->block_gon_req_tx &&
               (!ack) && (tx_retry < P2P_AF_TX_MAX_RETRY) &&
                !dwell_overflow) {
+               if (af_params->channel)
+                       msleep(P2P_AF_RETRY_DELAY_TIME);
+
                ack = !brcmf_p2p_tx_action_frame(p2p, af_params);
                tx_retry++;
                dwell_overflow = brcmf_p2p_check_dwell_overflow(requested_dwell,