diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-02-15 03:41:21 -0500 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-02-15 03:41:21 -0500 |
| commit | 8cdc196b743c4224ffa59fef38133559c1fd2a5e (patch) | |
| tree | f5de9fd936d42150ffdbfdacdbce41c6697acb8b /net/wireless/scan.c | |
| parent | 03395003bf8ac813b1a0ac9299b3496484caf228 (diff) | |
| parent | 3d9646d0abd02c552f6f15c302b31aa321c2fa8b (diff) | |
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, | |||
| 1398 | &iwe, IW_EV_UINT_LEN); | 1398 | &iwe, IW_EV_UINT_LEN); |
| 1399 | } | 1399 | } |
| 1400 | 1400 | ||
| 1401 | buf = kmalloc(30, GFP_ATOMIC); | 1401 | buf = kmalloc(31, GFP_ATOMIC); |
| 1402 | if (buf) { | 1402 | if (buf) { |
| 1403 | memset(&iwe, 0, sizeof(iwe)); | 1403 | memset(&iwe, 0, sizeof(iwe)); |
| 1404 | iwe.cmd = IWEVCUSTOM; | 1404 | iwe.cmd = IWEVCUSTOM; |