Merge remote-tracking branch 'wireless-next/master' into mac80211-next

[pandora-kernel.git] / net / wireless / nl80211.c

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 8e6b6a2..058aa0e 100644 (file)
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -5710,8 +5710,8 @@ static int nl80211_start_sched_scan(struct sk_buff *skb,
                request->min_rssi_thold = NL80211_SCAN_RSSI_THOLD_OFF;
        }
 
-       if (info->attrs[NL80211_ATTR_IE]) {
-               request->ie_len = nla_len(info->attrs[NL80211_ATTR_IE]);
+       if (ie_len) {
+               request->ie_len = ie_len;
                memcpy((void *)request->ie,
                       nla_data(info->attrs[NL80211_ATTR_IE]),
                       request->ie_len);