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

Browse Source 
Conflicts:
	drivers/net/wireless/wl12xx/wl1271.h
	drivers/net/wireless/wl12xx/wl1271_cmd.h
This commit is contained in:
David S. Miller
2010-06-11 11:34:06 -07:00
parent d8d1f30b95 832c10fd73
commit 14599f1e34
186 changed files with 8455 additions and 4256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/orinoco/hermes_dld.c
View File

@@ -68,7 +68,7 @@ struct dblock {
} __packed;
/*
* Plug Data References are located in in the image after the last data
* Plug Data References are located in the image after the last data
* block. They refer to areas in the adapter memory where the plug data
* items with matching ID should be written.
*/

4
drivers/net/wireless/orinoco/orinoco_usb.c
View File

@@ -356,12 +356,10 @@ static struct request_context *ezusb_alloc_ctx(struct ezusb_priv *upriv,
{
struct request_context *ctx;
ctx = kmalloc(sizeof(*ctx), GFP_ATOMIC);
ctx = kzalloc(sizeof(*ctx), GFP_ATOMIC);
if (!ctx)
return NULL;
memset(ctx, 0, sizeof(*ctx));
ctx->buf = kmalloc(BULK_BUF_SIZE, GFP_ATOMIC);
if (!ctx->buf) {
kfree(ctx);

4
drivers/net/wireless/orinoco/wext.c
View File

@@ -993,11 +993,9 @@ static int orinoco_ioctl_set_genie(struct net_device *dev,
return -EINVAL;
if (wrqu->data.length) {
buf = kmalloc(wrqu->data.length, GFP_KERNEL);
buf = kmemdup(extra, wrqu->data.length, GFP_KERNEL);
if (buf == NULL)
return -ENOMEM;
memcpy(buf, extra, wrqu->data.length);
} else
buf = NULL;