Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 43227
b: refs/heads/master
c: b0471bb
h: refs/heads/master
i:
  43225: b6013ec
  43223: 54c4083
v: v3
  • Loading branch information
Yan Burman authored and John W. Linville committed Dec 6, 2006
1 parent 8973a0f commit 10d5afe
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 33 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9cdac9657fda58ae39c2bbc8be396f5530ed8398
refs/heads/master: b0471bb7b779f5deea109e5bfdfe8c18d4a06241
4 changes: 1 addition & 3 deletions trunk/drivers/net/wireless/hostap/hostap_ap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1099,15 +1099,13 @@ static struct sta_info * ap_add_sta(struct ap_data *ap, u8 *addr)
{
struct sta_info *sta;

sta = (struct sta_info *)
kmalloc(sizeof(struct sta_info), GFP_ATOMIC);
sta = kzalloc(sizeof(struct sta_info), GFP_ATOMIC);
if (sta == NULL) {
PDEBUG(DEBUG_AP, "AP: kmalloc failed\n");
return NULL;
}

/* initialize STA info data */
memset(sta, 0, sizeof(struct sta_info));
sta->local = ap->local;
skb_queue_head_init(&sta->tx_buf);
memcpy(sta->addr, addr, ETH_ALEN);
Expand Down
3 changes: 1 addition & 2 deletions trunk/drivers/net/wireless/hostap/hostap_cs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -566,12 +566,11 @@ static int prism2_config(struct pcmcia_device *link)
PDEBUG(DEBUG_FLOW, "prism2_config()\n");

parse = kmalloc(sizeof(cisparse_t), GFP_KERNEL);
hw_priv = kmalloc(sizeof(*hw_priv), GFP_KERNEL);
hw_priv = kzalloc(sizeof(*hw_priv), GFP_KERNEL);
if (parse == NULL || hw_priv == NULL) {
ret = -ENOMEM;
goto failed;
}
memset(hw_priv, 0, sizeof(*hw_priv));

tuple.DesiredTuple = CISTPL_CONFIG;
tuple.Attributes = 0;
Expand Down
4 changes: 1 addition & 3 deletions trunk/drivers/net/wireless/hostap/hostap_download.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -685,14 +685,12 @@ static int prism2_download(local_info_t *local,
goto out;
}

dl = kmalloc(sizeof(*dl) + param->num_areas *
dl = kzalloc(sizeof(*dl) + param->num_areas *
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;
Expand Down
12 changes: 3 additions & 9 deletions trunk/drivers/net/wireless/hostap/hostap_hw.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -347,14 +347,12 @@ static int hfa384x_cmd(struct net_device *dev, u16 cmd, u16 param0,
if (signal_pending(current))
return -EINTR;

entry = (struct hostap_cmd_queue *)
kmalloc(sizeof(*entry), GFP_ATOMIC);
entry = kzalloc(sizeof(*entry), GFP_ATOMIC);
if (entry == NULL) {
printk(KERN_DEBUG "%s: hfa384x_cmd - kmalloc failed\n",
dev->name);
return -ENOMEM;
}
memset(entry, 0, sizeof(*entry));
atomic_set(&entry->usecnt, 1);
entry->type = CMD_SLEEP;
entry->cmd = cmd;
Expand Down Expand Up @@ -517,14 +515,12 @@ static int hfa384x_cmd_callback(struct net_device *dev, u16 cmd, u16 param0,
return -1;
}

entry = (struct hostap_cmd_queue *)
kmalloc(sizeof(*entry), GFP_ATOMIC);
entry = kzalloc(sizeof(*entry), GFP_ATOMIC);
if (entry == NULL) {
printk(KERN_DEBUG "%s: hfa384x_cmd_callback - kmalloc "
"failed\n", dev->name);
return -ENOMEM;
}
memset(entry, 0, sizeof(*entry));
atomic_set(&entry->usecnt, 1);
entry->type = CMD_CALLBACK;
entry->cmd = cmd;
Expand Down Expand Up @@ -3015,14 +3011,12 @@ static int prism2_set_tim(struct net_device *dev, int aid, int set)
iface = netdev_priv(dev);
local = iface->local;

new_entry = (struct set_tim_data *)
kmalloc(sizeof(*new_entry), GFP_ATOMIC);
new_entry = kzalloc(sizeof(*new_entry), GFP_ATOMIC);
if (new_entry == NULL) {
printk(KERN_DEBUG "%s: prism2_set_tim: kmalloc failed\n",
local->dev->name);
return -ENOMEM;
}
memset(new_entry, 0, sizeof(*new_entry));
new_entry->aid = aid;
new_entry->set = set;

Expand Down
3 changes: 1 addition & 2 deletions trunk/drivers/net/wireless/hostap/hostap_info.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,11 +327,10 @@ static void prism2_info_hostscanresults(local_info_t *local,
ptr = (u8 *) pos;

new_count = left / result_size;
results = kmalloc(new_count * sizeof(struct hfa384x_hostscan_result),
results = kcalloc(new_count, sizeof(struct hfa384x_hostscan_result),
GFP_ATOMIC);
if (results == NULL)
return;
memset(results, 0, new_count * sizeof(struct hfa384x_hostscan_result));

for (i = 0; i < new_count; i++) {
memcpy(&results[i], ptr, copy_len);
Expand Down
12 changes: 3 additions & 9 deletions trunk/drivers/net/wireless/hostap/hostap_ioctl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,12 +181,10 @@ static int prism2_ioctl_siwencode(struct net_device *dev,
struct ieee80211_crypt_data *new_crypt;

/* take WEP into use */
new_crypt = (struct ieee80211_crypt_data *)
kmalloc(sizeof(struct ieee80211_crypt_data),
new_crypt = kzalloc(sizeof(struct ieee80211_crypt_data),
GFP_KERNEL);
if (new_crypt == NULL)
return -ENOMEM;
memset(new_crypt, 0, sizeof(struct ieee80211_crypt_data));
new_crypt->ops = ieee80211_get_crypto_ops("WEP");
if (!new_crypt->ops) {
request_module("ieee80211_crypt_wep");
Expand Down Expand Up @@ -3320,14 +3318,12 @@ static int prism2_ioctl_siwencodeext(struct net_device *dev,

prism2_crypt_delayed_deinit(local, crypt);

new_crypt = (struct ieee80211_crypt_data *)
kmalloc(sizeof(struct ieee80211_crypt_data),
new_crypt = kzalloc(sizeof(struct ieee80211_crypt_data),
GFP_KERNEL);
if (new_crypt == NULL) {
ret = -ENOMEM;
goto done;
}
memset(new_crypt, 0, sizeof(struct ieee80211_crypt_data));
new_crypt->ops = ops;
new_crypt->priv = new_crypt->ops->init(i);
if (new_crypt->priv == NULL) {
Expand Down Expand Up @@ -3538,14 +3534,12 @@ static int prism2_ioctl_set_encryption(local_info_t *local,

prism2_crypt_delayed_deinit(local, crypt);

new_crypt = (struct ieee80211_crypt_data *)
kmalloc(sizeof(struct ieee80211_crypt_data),
new_crypt = kzalloc(sizeof(struct ieee80211_crypt_data),
GFP_KERNEL);
if (new_crypt == NULL) {
ret = -ENOMEM;
goto done;
}
memset(new_crypt, 0, sizeof(struct ieee80211_crypt_data));
new_crypt->ops = ops;
new_crypt->priv = new_crypt->ops->init(param->u.crypt.idx);
if (new_crypt->priv == NULL) {
Expand Down
3 changes: 1 addition & 2 deletions trunk/drivers/net/wireless/hostap/hostap_pci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -300,10 +300,9 @@ static int prism2_pci_probe(struct pci_dev *pdev,
struct hostap_interface *iface;
struct hostap_pci_priv *hw_priv;

hw_priv = kmalloc(sizeof(*hw_priv), GFP_KERNEL);
hw_priv = kzalloc(sizeof(*hw_priv), GFP_KERNEL);
if (hw_priv == NULL)
return -ENOMEM;
memset(hw_priv, 0, sizeof(*hw_priv));

if (pci_enable_device(pdev))
goto err_out_free;
Expand Down
3 changes: 1 addition & 2 deletions trunk/drivers/net/wireless/hostap/hostap_plx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -447,10 +447,9 @@ static int prism2_plx_probe(struct pci_dev *pdev,
int tmd7160;
struct hostap_plx_priv *hw_priv;

hw_priv = kmalloc(sizeof(*hw_priv), GFP_KERNEL);
hw_priv = kzalloc(sizeof(*hw_priv), GFP_KERNEL);
if (hw_priv == NULL)
return -ENOMEM;
memset(hw_priv, 0, sizeof(*hw_priv));

if (pci_enable_device(pdev))
goto err_out_free;
Expand Down

0 comments on commit 10d5afe

Please sign in to comment.