Revert "brcmfmac: move configuration of probe request IEs"

[platform/kernel/linux-rpi.git] / drivers / net / wireless / broadcom / brcm80211 / brcmfmac / p2p.c

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
index 1f5deea..4421bf6 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
@@ -872,7 +872,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 */
@@ -895,7 +895,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;
 }