Merge branch 'wl12xx-next' into for-linville

[~andy/linux] / drivers / net / wireless / ti / wlcore / cmd.c

diff --git a/drivers/net/wireless/ti/wlcore/cmd.c b/drivers/net/wireless/ti/wlcore/cmd.c
index 14734b7fc6e8f5022469682dc4437ed162d4e534..1201aca9c89a4cfde99474c38435521a28663d4e 100644 (file)
--- a/drivers/net/wireless/ti/wlcore/cmd.c
+++ b/drivers/net/wireless/ti/wlcore/cmd.c
@@ -1093,11 +1093,13 @@ int wl12xx_cmd_build_probe_req(struct wl1271 *wl, struct wl12xx_vif *wlvif,
        u16 template_id_5 = wl->scan_templ_id_5;
 
        skb = ieee80211_probereq_get(wl->hw, vif, ssid, ssid_len,
-                                    ie, ie_len);
+                                    ie_len);
        if (!skb) {
                ret = -ENOMEM;
                goto out;
        }
+       if (ie_len)
+               memcpy(skb_put(skb, ie_len), ie, ie_len);
 
        wl1271_dump(DEBUG_SCAN, "PROBE REQ: ", skb->data, skb->len);