Revert "brcmfmac: move configuration of probe request IEs"

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>

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index 1dd7a1f439f9c3129dddf4b4d4e1b89dd2b57e71..858871c79821cd4bd87f3bcbe934dade9d2739ce 100644 (file)
--- 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 3e9c4f2f5dd12673e8c96e6dcacbea50cf7bc45e..c856ee5debfc287789a2afc0bd391bcb6cb4e115 100644 (file)
--- 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;
 }