diff options
| author | Jaehoon Chung <jh80.chung@samsung.com> | 2020-08-03 14:45:35 +0900 |
|---|---|---|
| committer | Jaehoon Chung <jh80.chung@samsung.com> | 2024-11-12 13:03:18 +0900 |
| commit | 92496a9a22893ba3864229968c91e86312aff0e8 (patch) | |
| tree | d500b4a4ec703f1b1a6e0fb0cb79f2a59b491c36 | |
| parent | c7a9fd3da8184db66909544f22c4340a1e913de8 (diff) | |
| download | linux-rpi-92496a9a22893ba3864229968c91e86312aff0e8.tar.gz linux-rpi-92496a9a22893ba3864229968c91e86312aff0e8.tar.bz2 linux-rpi-92496a9a22893ba3864229968c91e86312aff0e8.zip | |
Revert "brcmfmac: move configuration of probe request IEs"
This reverts commit bd99a3013bdc00f8fc7534c657b39616792b4467.
It doesn't find any p2p-device with wpa_supplicant on Tizen.
- After reverted this, it's working fine.
Change-Id: I819242c3578aaf54ccfd113dc8130a4de899638b
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
| -rw-r--r-- | drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 5 | ||||
| -rw-r--r-- | 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 e19c14ba35f6..385b5ab45316 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c @@ -1559,11 +1559,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 99ee0e6b13c2..f7284f5fd8a4 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 */ @@ -917,7 +917,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; } |