mirror of
https://github.com/armbian/build
synced 2025-09-24 19:47:06 +07:00
62 lines
2.2 KiB
Diff
62 lines
2.2 KiB
Diff
From 4aa36126c355bcae29e168f583546bc65057d065 Mon Sep 17 00:00:00 2001
|
|
From: Ting-Ying Li <tingying.li@cypress.com>
|
|
Date: Fri, 21 Feb 2020 04:02:25 -0600
|
|
Subject: [PATCH 031/179] non-upstream: Fix no P2P IE in probe requests issue
|
|
|
|
This reverts commit bd99a3013bdc00f8fc7534c657b39616792b4467.
|
|
|
|
The original parameter "vif" is updated in brcmf_p2p_scan_prep()
|
|
but the new code does not get the same vif.
|
|
|
|
Fixes: bd99a30 ("brcmfmac: move configuration of probe request IEs")
|
|
Signed-off-by: Ting-Ying Li <tingying.li@cypress.com>
|
|
Signed-off-by: Chi-hsien Lin <chi-hsien.lin@cypress.com>
|
|
---
|
|
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 5 -----
|
|
drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 6 ++++--
|
|
2 files changed, 4 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
|
|
index afb936150eaa..094a2e49d646 100644
|
|
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
|
|
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
|
|
@@ -1214,11 +1214,6 @@ brcmf_cfg80211_scan(struct wiphy *wiphy, struct cfg80211_scan_request *request)
|
|
if (err)
|
|
goto scan_out;
|
|
|
|
- err = brcmf_vif_set_mgmt_ie(vif, BRCMF_VNDR_IE_PRBREQ_FLAG,
|
|
- request->ie, request->ie_len);
|
|
- if (err)
|
|
- goto scan_out;
|
|
-
|
|
err = brcmf_do_escan(vif->ifp, request);
|
|
if (err)
|
|
goto scan_out;
|
|
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
|
|
index 9ac0d8c73d5a..9ec232e3dfe8 100644
|
|
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
|
|
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
|
|
@@ -894,7 +894,7 @@ int brcmf_p2p_scan_prep(struct wiphy *wiphy,
|
|
{
|
|
struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
|
|
struct brcmf_p2p_info *p2p = &cfg->p2p;
|
|
- int err;
|
|
+ int err = 0;
|
|
|
|
if (brcmf_p2p_scan_is_p2p_request(request)) {
|
|
/* find my listen channel */
|
|
@@ -915,7 +915,9 @@ int brcmf_p2p_scan_prep(struct wiphy *wiphy,
|
|
/* override .run_escan() callback. */
|
|
cfg->escan_info.run = brcmf_p2p_run_escan;
|
|
}
|
|
- return 0;
|
|
+ err = brcmf_vif_set_mgmt_ie(vif, BRCMF_VNDR_IE_PRBREQ_FLAG,
|
|
+ request->ie, request->ie_len);
|
|
+ return err;
|
|
}
|
|
|
|
|
|
--
|
|
2.17.1
|
|
|