summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2013-02-01 13:43:25 -0500
committerJohn W. Linville <linville@tuxdriver.com>2013-02-01 13:43:25 -0500
commited6882ac40552034ae6bde3e540b84c832dc8491 (patch)
tree989f14b7cee32d55f28b87c3610ffd41cefc8825 /net
parent66555e92fb7a619188c02cceae4bbc414f15f96d (diff)
parent8a7d7cbf7b5ff9912ef50b3e94c9ad9f37b1c75f (diff)
downloadlinux-3.10-ed6882ac40552034ae6bde3e540b84c832dc8491.tar.gz
linux-3.10-ed6882ac40552034ae6bde3e540b84c832dc8491.tar.bz2
linux-3.10-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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/scan.c b/net/wireless/scan.c
index 01592d7d478..45f1618c8e2 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;