diff options
| author |  Johannes Berg <johannes.berg@intel.com>
| 2013-02-15 09:41:21 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com>
| 2013-02-15 09:41:21 +0100 |
| commit | 8cdc196b743c4224ffa59fef38133559c1fd2a5e (patch) | |
| tree | f5de9fd936d42150ffdbfdacdbce41c6697acb8b /net/wireless/scan.c | |
| parent | mac80211: use spin_lock_bh() for TKIP lock (diff) | |
| parent | mac80211: fix channel selection bug (diff) | |
| download | linux-8cdc196b743c4224ffa59fef38133559c1fd2a5e.tar.gz linux-8cdc196b743c4224ffa59fef38133559c1fd2a5e.tar.bz2 linux-8cdc196b743c4224ffa59fef38133559c1fd2a5e.zip | |
Merge remote-tracking branch 'mac80211/master' into HEAD
Diffstat (limited to 'net/wireless/scan.c')
| -rw-r--r-- | net/wireless/scan.c | 2 |
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; |