lkml.org 
[lkml]   [2007]   [Jan]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Subject[PATCH] bonding: Replace kmalloc() + memset() pairs with the appropriate kzalloc() calls
From
Date
This patch replace kmalloc() + memset() pairs with the appropriate
kzalloc() calls.

Signed-off-by: Joe Jin <lkmaillist@gmail.com>
--
diff -urNp old/drivers/net/bonding/bond_alb.c
new/drivers/net/bonding/bond_alb.c
--- old/drivers/net/bonding/bond_alb.c 2006-11-30 05:57:37.000000000
+0800
+++ new/drivers/net/bonding/bond_alb.c 2007-01-09 13:13:16.000000000
+0800
@@ -184,7 +184,7 @@ static int tlb_initialize(struct bonding

spin_lock_init(&(bond_info->tx_hashtbl_lock));

- new_hashtbl = kmalloc(size, GFP_KERNEL);
+ new_hashtbl = kzalloc(size, GFP_KERNEL);
if (!new_hashtbl) {
printk(KERN_ERR DRV_NAME
": %s: Error: Failed to allocate TLB hash table\n",
@@ -195,8 +195,6 @@ static int tlb_initialize(struct bonding

bond_info->tx_hashtbl = new_hashtbl;

- memset(bond_info->tx_hashtbl, 0, size);
-
for (i = 0; i < TLB_HASH_TABLE_SIZE; i++) {
tlb_init_table_entry(&bond_info->tx_hashtbl[i], 1);
}
@@ -788,7 +786,7 @@ static int rlb_initialize(struct bonding

spin_lock_init(&(bond_info->rx_hashtbl_lock));

- new_hashtbl = kmalloc(size, GFP_KERNEL);
+ new_hashtbl = kzalloc(size, GFP_KERNEL);
if (!new_hashtbl) {
printk(KERN_ERR DRV_NAME
": %s: Error: Failed to allocate RLB hash table\n",
diff -urNp old/drivers/net/bonding/bond_main.c
new/drivers/net/bonding/bond_main.c
--- old/drivers/net/bonding/bond_main.c 2006-11-30 05:57:37.000000000
+0800
+++ new/drivers/net/bonding/bond_main.c 2007-01-09 13:14:20.000000000
+0800
@@ -1336,14 +1336,12 @@ int bond_enslave(struct net_device *bond
goto err_undo_flags;
}

- new_slave = kmalloc(sizeof(struct slave), GFP_KERNEL);
+ new_slave = kzalloc(sizeof(struct slave), GFP_KERNEL);
if (!new_slave) {
res = -ENOMEM;
goto err_undo_flags;
}

- memset(new_slave, 0, sizeof(struct slave));
-
/* save slave's original flags before calling
* netdev_set_master and dev_open
*/

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2007-01-12 04:35    [W:0.045 / U:0.096 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site