UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[PKTGEN]: Use kzalloc 

These are cleanup patches for pktgen that can go in 2.6.15
Can use kzalloc in a couple of places.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Robert Olsson <robert.olsson@its.uu.se>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
This commit is contained in:
Stephen Hemminger 2005-10-14 15:29:48 -07:00 committed by Arnaldo Carvalho de Melo
parent b7c8921bf1
commit 2845b63b50
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
net/core/pktgen.c
View File

@ -2869,12 +2869,10 @@ static int pktgen_add_device(struct pktgen_thread *t, const char* ifname)
if( (pkt_dev = __pktgen_NN_threads(ifname, FIND)) == NULL) { if( (pkt_dev = __pktgen_NN_threads(ifname, FIND)) == NULL) {
pkt_dev = kmalloc(sizeof(struct pktgen_dev), GFP_KERNEL); pkt_dev = kzalloc(sizeof(struct pktgen_dev), GFP_KERNEL);
if (!pkt_dev) if (!pkt_dev)
return -ENOMEM; return -ENOMEM;
memset(pkt_dev, 0, sizeof(struct pktgen_dev));
pkt_dev->flows = vmalloc(MAX_CFLOWS*sizeof(struct flow_state)); pkt_dev->flows = vmalloc(MAX_CFLOWS*sizeof(struct flow_state));
if (pkt_dev->flows == NULL) { if (pkt_dev->flows == NULL) {
kfree(pkt_dev); kfree(pkt_dev);
@ -2958,13 +2956,12 @@ static int pktgen_create_thread(const char* name, int cpu)
return -EINVAL; return -EINVAL;
} }
t = (struct pktgen_thread*)(kmalloc(sizeof(struct pktgen_thread), GFP_KERNEL)); t = kzalloc(sizeof(struct pktgen_thread), GFP_KERNEL);
if (!t) { if (!t) {
printk("pktgen: ERROR: out of memory, can't create new thread.\n"); printk("pktgen: ERROR: out of memory, can't create new thread.\n");
return -ENOMEM; return -ENOMEM;
} }
memset(t, 0, sizeof(struct pktgen_thread));
strcpy(t->name, name); strcpy(t->name, name);
spin_lock_init(&t->if_lock); spin_lock_init(&t->if_lock);
t->cpu = cpu; t->cpu = cpu;