Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211

cb73e2b9 · John W. Linville · 83f0c6d1 · c49dc900 · cb73e2b9
Commit cb73e2b9 authored Jan 28, 2013 by John W. Linville
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

net/wireless/scan.c net/wireless/scan.c +1 -1

No files found.
--- a/net/wireless/scan.c
+++ b/net/wireless/scan.c
@@ -1358,7 +1358,7 @@ ieee80211_bss(struct wiphy *wiphy, struct iw_request_info *info,
 						  &iwe, IW_EV_UINT_LEN);
 	}

-	buf = kmalloc(30, GFP_ATOMIC);
+	buf = kmalloc(31, GFP_ATOMIC);
 	if (buf) {
 		memset(&iwe, 0, sizeof(iwe));
 		iwe.cmd = IWEVCUSTOM;