brcmfmac: p2p cert 6.1.9-support GOUT handling p2p presence request

Send p2p presence response from the p2p interface address instead
of the p2p device address. This is needed for p2p cert 6.1.9 to pass.

Signed-off-by: Madhan Mohan R <MadhanMohan.R@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/1587970803-77700-4-git-send-email-chi-hsien.lin@cypress.com

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
index 1f5deea..c68edb1 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
@@ -1491,6 +1491,7 @@ static s32 brcmf_p2p_tx_action_frame(struct brcmf_p2p_info *p2p,
 {
        struct brcmf_pub *drvr = p2p->cfg->pub;
        struct brcmf_cfg80211_vif *vif;
+       struct brcmf_p2p_action_frame *p2p_af;
        s32 err = 0;
        s32 timeout = 0;
 
@@ -1500,7 +1501,13 @@ static s32 brcmf_p2p_tx_action_frame(struct brcmf_p2p_info *p2p,
        clear_bit(BRCMF_P2P_STATUS_ACTION_TX_COMPLETED, &p2p->status);
        clear_bit(BRCMF_P2P_STATUS_ACTION_TX_NOACK, &p2p->status);
 
-       vif = p2p->bss_idx[P2PAPI_BSSCFG_DEVICE].vif;
+       /* check if it is a p2p_presence response */
+       p2p_af = (struct brcmf_p2p_action_frame *)af_params->action_frame.data;
+       if (p2p_af->subtype == P2P_AF_PRESENCE_RSP)
+               vif = p2p->bss_idx[P2PAPI_BSSCFG_CONNECTION].vif;
+       else
+               vif = p2p->bss_idx[P2PAPI_BSSCFG_DEVICE].vif;
+
        err = brcmf_fil_bsscfg_data_set(vif->ifp, "actframe", af_params,
                                        sizeof(*af_params));
        if (err) {