openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[PATCH] prism54: replace kmalloc+memset with kzalloc 

Replace kmalloc+memset with kzalloc

Signed-off-by: Yan Burman <burman.yan@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Yan Burman 2006-12-02 13:35:20 +02:00 committed by John W. Linville
parent b0471bb7b7
commit b950e83b69
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/wireless/prism54/isl_ioctl.c
View File

@ -2140,11 +2140,9 @@ prism54_wpa_bss_ie_add(islpci_private *priv, u8 *bssid,
struct islpci_bss_wpa_ie, list); struct islpci_bss_wpa_ie, list);
list_del(&bss->list); list_del(&bss->list);
} else { } else {
bss = kmalloc(sizeof (*bss), GFP_ATOMIC); bss = kzalloc(sizeof (*bss), GFP_ATOMIC);
if (bss != NULL) { if (bss != NULL)
priv->num_bss_wpa++; priv->num_bss_wpa++;
memset(bss, 0, sizeof (*bss));
}
} }
if (bss != NULL) { if (bss != NULL) {
memcpy(bss->bssid, bssid, ETH_ALEN); memcpy(bss->bssid, bssid, ETH_ALEN);
@ -2684,11 +2682,10 @@ prism2_ioctl_set_generic_element(struct net_device *ndev,
return -EINVAL; return -EINVAL;
alen = sizeof(*attach) + len; alen = sizeof(*attach) + len;
attach = kmalloc(alen, GFP_KERNEL); attach = kzalloc(alen, GFP_KERNEL);
if (attach == NULL) if (attach == NULL)
return -ENOMEM; return -ENOMEM;
memset(attach, 0, alen);
#define WLAN_FC_TYPE_MGMT 0 #define WLAN_FC_TYPE_MGMT 0
#define WLAN_FC_STYPE_ASSOC_REQ 0 #define WLAN_FC_STYPE_ASSOC_REQ 0
#define WLAN_FC_STYPE_REASSOC_REQ 2 #define WLAN_FC_STYPE_REASSOC_REQ 2

4
drivers/net/wireless/prism54/oid_mgt.c
View File

@ -235,12 +235,10 @@ mgt_init(islpci_private *priv)
{ {
int i; int i;
priv->mib = kmalloc(OID_NUM_LAST * sizeof (void *), GFP_KERNEL); priv->mib = kcalloc(OID_NUM_LAST, sizeof (void *), GFP_KERNEL);
if (!priv->mib) if (!priv->mib)
return -ENOMEM; return -ENOMEM;
memset(priv->mib, 0, OID_NUM_LAST * sizeof (void *));
/* Alloc the cache */ /* Alloc the cache */
for (i = 0; i < OID_NUM_LAST; i++) { for (i = 0; i < OID_NUM_LAST; i++) {
if (isl_oid[i].flags & OID_FLAG_CACHED) { if (isl_oid[i].flags & OID_FLAG_CACHED) {