Partially Revert "brcmfmac: p2p: Deal with set but unused variables"

This partially reverts commit 2de64ca7c9fadd32b261530592db4a6adbfcb53f.

The commit 61325dc073e2 ("Revert "brcmfmac: move configuration of
probe request IEs"") requires vif set with p2p interface, but commit
2de64ca7c9fa removes setting. Partially revert the commit to support
p2p usage with p2p interface.

Change-Id: Iaa3a6c57bb9e14c80ef9f4714eea0cfc447d6adc
Reported-by: Jiung Yu <jiung.yu@samsung.com>
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
index 7376f9f37d07b45b436bc342fb1d659517c347f8..99ee0e6b13c24c7730bcdf427c925a5f6e96508f 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
@@ -912,6 +912,8 @@ int brcmf_p2p_scan_prep(struct wiphy *wiphy,
                if (err)
                        return err;
 
+               vif = p2p->bss_idx[P2PAPI_BSSCFG_DEVICE].vif;
+
                /* override .run_escan() callback. */
                cfg->escan_info.run = brcmf_p2p_run_escan;
        }