diff options
| author | John W. Linville | 2013-01-28 20:46:50 +0100 |
|---|---|---|
| committer | John W. Linville | 2013-01-28 20:46:50 +0100 |
| commit | cb73e2b9ed1240398c773eec3c976edd99baf5b9 (patch) | |
| tree | 5642923e9bee3f5dac4f31f6a26482726990034b /net | |
| parent | mwifiex: fix typo in PCIe adapter NULL check (diff) | |
| parent | cfg80211: off by one in ieee80211_bss() (diff) | |
| download | kernel-qcow2-linux-cb73e2b9ed1240398c773eec3c976edd99baf5b9.tar.gz kernel-qcow2-linux-cb73e2b9ed1240398c773eec3c976edd99baf5b9.tar.xz kernel-qcow2-linux-cb73e2b9ed1240398c773eec3c976edd99baf5b9.zip | |
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, &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; |