brcmfmac: assure P2P discovery is disabled when setting P2P_DEVICE mac address

In order to provision the P2P_DEVICE mac address using p2p_da_override iovar
the discovery interface must be disabled. On some targets setting the mac
address failed so disable the discovery interface to be certain.

Reviewed-by: Hante Meuleman <[email protected]>
Reviewed-by: Franky (Zhenhui) Lin <[email protected]>
Reviewed-by: Daniel (Deognyoun) Kim <[email protected]>
Reviewed-by: Pieter-Paul Giesberts <[email protected]>
Signed-off-by: Arend van Spriel <[email protected]>
Signed-off-by: John W. Linville <[email protected]>

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c b/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
index 1d78a91db59428a137bb829cbd3203bac69fea36..d54c58a32faa52bf9b6dc2cb36edd35c07993302 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
@@ -440,8 +440,11 @@ static int brcmf_p2p_set_firmware(struct brcmf_if *ifp, u8 *p2p_mac)
 
        /* In case of COB type, firmware has default mac address
         * After Initializing firmware, we have to set current mac address to
-        * firmware for P2P device address
+        * firmware for P2P device address. This must be done with discovery
+        * disabled.
         */
+       brcmf_fil_iovar_int_set(ifp, "p2p_disc", 0);
+
        ret = brcmf_fil_iovar_data_set(ifp, "p2p_da_override", p2p_mac,
                                       ETH_ALEN);
        if (ret)