diff options
| author | Jaehoon Chung <jh80.chung@samsung.com> | 2020-08-03 15:41:28 +0900 |
|---|---|---|
| committer | Jaehoon Chung <jh80.chung@samsung.com> | 2020-08-03 15:42:13 +0900 |
| commit | 1672851ed296f7a9097dbbeabf9ddd51b648009d (patch) | |
| tree | a83fa562d2e7fbece6b0d7776db30198b244bfec | |
| parent | 0e55e59ae473a19ab160c838505c83d9b023e7e7 (diff) | |
| download | linux-rpi3-1672851ed296f7a9097dbbeabf9ddd51b648009d.tar.gz linux-rpi3-1672851ed296f7a9097dbbeabf9ddd51b648009d.tar.bz2 linux-rpi3-1672851ed296f7a9097dbbeabf9ddd51b648009d.zip | |
Revert "brcmfmac: move configuration of probe request IEs"submit/tizen/20200803.071449accepted/tizen/unified/20200803.122234
This reverts commit bd99a3013bdc00f8fc7534c657b39616792b4467.
It doesn't find any p2p-device with wpa_supplicant on Tien.
- After reverted this, it's working fine.
Change-Id: I1cd77e65ad17078370116473dd46adc7338d6695
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 1dd7a1f439f9..858871c79821 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c @@ -1108,11 +1108,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 3e9c4f2f5dd1..c856ee5debfc 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c @@ -879,7 +879,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 */ @@ -902,7 +902,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; } |