git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
net
/
wireless
/
hostap
/
hostap_download.c
diff --git
a/drivers/net/wireless/hostap/hostap_download.c
b/drivers/net/wireless/hostap/hostap_download.c
index
ab26b52
..
c7678e6
100644
(file)
--- a/
drivers/net/wireless/hostap/hostap_download.c
+++ b/
drivers/net/wireless/hostap/hostap_download.c
@@
-201,7
+201,7
@@
static u8 * prism2_read_pda(struct net_device *dev)
0x7f0002 /* Intel PRO/Wireless 2011B (PCI) */,
};
0x7f0002 /* Intel PRO/Wireless 2011B (PCI) */,
};
- buf =
(u8 *)
kmalloc(PRISM2_PDA_SIZE, GFP_KERNEL);
+ buf = kmalloc(PRISM2_PDA_SIZE, GFP_KERNEL);
if (buf == NULL)
return NULL;
if (buf == NULL)
return NULL;
@@
-685,14
+685,12
@@
static int prism2_download(local_info_t *local,
goto out;
}
goto out;
}
- dl = k
m
alloc(sizeof(*dl) + param->num_areas *
+ dl = k
z
alloc(sizeof(*dl) + param->num_areas *
sizeof(struct prism2_download_data_area), GFP_KERNEL);
if (dl == NULL) {
ret = -ENOMEM;
goto out;
}
sizeof(struct prism2_download_data_area), GFP_KERNEL);
if (dl == NULL) {
ret = -ENOMEM;
goto out;
}
- memset(dl, 0, sizeof(*dl) + param->num_areas *
- sizeof(struct prism2_download_data_area));
dl->dl_cmd = param->dl_cmd;
dl->start_addr = param->start_addr;
dl->num_areas = param->num_areas;
dl->dl_cmd = param->dl_cmd;
dl->start_addr = param->start_addr;
dl->num_areas = param->num_areas;