summaryrefslogtreecommitdiff
path: root/net/wireless
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-02-15 12:41:21 +0400
committerJohannes Berg <johannes.berg@intel.com>2013-02-15 12:41:21 +0400
commit8cdc196b743c4224ffa59fef38133559c1fd2a5e (patch)
treef5de9fd936d42150ffdbfdacdbce41c6697acb8b /net/wireless
parent03395003bf8ac813b1a0ac9299b3496484caf228 (diff)
parent3d9646d0abd02c552f6f15c302b31aa321c2fa8b (diff)
downloadlinux-8cdc196b743c4224ffa59fef38133559c1fd2a5e.tar.xz
Merge remote-tracking branch 'mac80211/master' into HEAD
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/scan.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/scan.c b/net/wireless/scan.c
index f0d9b5154bab..674aadca0079 100644
--- a/net/wireless/scan.c
+++ b/net/wireless/scan.c
@@ -1398,7 +1398,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;