---

yaml --- r: 254895 b: refs/heads/master c: 1186980 h: refs/heads/master i: 254893: 1b75cec 254891: 005f25a 254887: 0082a79 254879: b752890 v: v3
git-mirror · Jul 7, 2011 · 2654326 · 2654326
1 parent 991f9d3
commit 2654326
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;