From 7962050c9aa08a69eb05bc9958891b088e8d2129 Mon Sep 17 00:00:00 2001 From: Chung-Hsien Hsu Date: Fri, 16 Jul 2021 01:46:23 -0500 Subject: [PATCH 064/296] brcmfmac: fix P2P device discovery failure Commit 2de64ca7c9fa ("brcmfmac: p2p: Deal with set but unused variables") removed the setting of vif for p2p device discovery in brcmf_p2p_scan_prep(), causing the discovery failure. Add back the setting to brcmf_p2p_scan_prep() to fix this. Fixes: 2de64ca7c9fa ("brcmfmac: p2p: Deal with set but unused variables") Signed-off-by: Chung-Hsien Hsu --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c index ae6c8349b07d..ad062a18d0c3 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c @@ -940,6 +940,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; } -- 2.25.1