diff options
| author |   John W. Linville <linville@tuxdriver.com> | 2013-02-01 13:43:25 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-02-01 13:43:25 -0500 |
| commit | ed6882ac40552034ae6bde3e540b84c832dc8491 (patch) | |
| tree | 989f14b7cee32d55f28b87c3610ffd41cefc8825 /net | |
| parent | tcp: detect SYN/data drop when F-RTO is disabled (diff) | |
| parent | mwifiex: fix incomplete scan in case of IE parsing error (diff) | |
| download | linux-dev-ed6882ac40552034ae6bde3e540b84c832dc8491.tar.xz linux-dev-ed6882ac40552034ae6bde3e540b84c832dc8491.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
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, &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; |