diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-01-28 14:46:50 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-01-28 14:46:50 -0500 |
| commit | cb73e2b9ed1240398c773eec3c976edd99baf5b9 (patch) | |
| tree | 5642923e9bee3f5dac4f31f6a26482726990034b /net | |
| parent | 83f0c6d1f502bd75bb4a9e31e8d64e59c6894ad1 (diff) | |
| parent | c49dc9008b1c641a86837297df7c90cef070571b (diff) | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Diffstat (limited to 'net')
| -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 01592d7d4789..45f1618c8e23 100644 --- a/net/wireless/scan.c +++ b/net/wireless/scan.c | |||
| @@ -1358,7 +1358,7 @@ ieee80211_bss(struct wiphy *wiphy, struct iw_request_info *info, | |||
| 1358 | &iwe, IW_EV_UINT_LEN); | 1358 | &iwe, IW_EV_UINT_LEN); |
| 1359 | } | 1359 | } |
| 1360 | 1360 | ||
| 1361 | buf = kmalloc(30, GFP_ATOMIC); | 1361 | buf = kmalloc(31, GFP_ATOMIC); |
| 1362 | if (buf) { | 1362 | if (buf) { |
| 1363 | memset(&iwe, 0, sizeof(iwe)); | 1363 | memset(&iwe, 0, sizeof(iwe)); |
| 1364 | iwe.cmd = IWEVCUSTOM; | 1364 | iwe.cmd = IWEVCUSTOM; |