From 265432688246c40b84e62017b3e0d4c2cd564a75 Mon Sep 17 00:00:00 2001 From: Luciano Coelho Date: Thu, 7 Jul 2011 15:18:27 +0300 Subject: [PATCH] --- yaml --- r: 254895 b: refs/heads/master c: 1186980dafcd14d0e257a4dd6990cefdc6f3e362 h: refs/heads/master i: 254893: 1b75cec0a02c1faf010499c443ee041b2c621484 254891: 005f25a16250ee39e1349172cf385e1371fecde7 254887: 0082a79a1ad71cc972f4afd6fa24392f743fd254 254879: b7528904ef7dc0a638e34588131d8bb3b6562961 v: v3 --- [refs] | 2 +- trunk/net/mac80211/scan.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a88b12cf1461..328c8b89c4d6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6ae8ec27868bfdbb815287bee8146acbefaee867 +refs/heads/master: 1186980dafcd14d0e257a4dd6990cefdc6f3e362 diff --git a/trunk/net/mac80211/scan.c b/trunk/net/mac80211/scan.c index 58ffa7d069c7..669d2e32efb6 100644 --- a/trunk/net/mac80211/scan.c +++ b/trunk/net/mac80211/scan.c @@ -877,7 +877,8 @@ int ieee80211_request_sched_scan_start(struct ieee80211_sub_if_data *sdata, for (i = 0; i < IEEE80211_NUM_BANDS; i++) { local->sched_scan_ies.ie[i] = kzalloc(2 + IEEE80211_MAX_SSID_LEN + - local->scan_ies_len, + local->scan_ies_len + + req->ie_len, GFP_KERNEL); if (!local->sched_scan_ies.ie[i]) { ret = -ENOMEM;