Merge remote-tracking branch 'mac80211/master' into HEAD

This commit is contained in:
Johannes Berg 2013-02-15 09:41:21 +01:00
commit 8cdc196b74
3 changed files with 10 additions and 6 deletions

View file

@ -1398,7 +1398,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;