xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

Browse Source
This commit is contained in:
John W. Linville
2010-05-17 13:57:43 -04:00
parent 278554bd65 0c348d7c14
commit 6fe70aae0d
60 changed files with 2161 additions and 1451 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/wireless/hostap/hostap_80211_rx.c
View File

@@ -355,8 +355,7 @@ static struct hostap_bss_info *__hostap_add_bss(local_info_t *local, u8 *bssid,
list_del(&bss->list);
local->num_bss_info--;
} else {
bss = (struct hostap_bss_info *)
kmalloc(sizeof(*bss), GFP_ATOMIC);
bss = kmalloc(sizeof(*bss), GFP_ATOMIC);
if (bss == NULL)
return NULL;
}

3
drivers/net/wireless/hostap/hostap_ioctl.c
View File

@@ -3039,8 +3039,7 @@ static int prism2_ioctl_priv_download(local_info_t *local, struct iw_point *p)
p->length > 1024 || !p->pointer)
return -EINVAL;
param = (struct prism2_download_param *)
kmalloc(p->length, GFP_KERNEL);
param = kmalloc(p->length, GFP_KERNEL);
if (param == NULL)
return -ENOMEM;