[patch 05/11] bonding: Replace kmalloc() + memset() pairs with the appropriate kzalloc() calls

[patch 05/11] bonding: Replace kmalloc() + memset() pairs with the appropriate kzalloc() calls

[akpm]

From: "Joe Jin" <lkmaillist@gmail.com>

Replace kmalloc() + memset() pairs with the appropriate kzalloc() calls in
the bonding driver.

Signed-off-by: Joe Jin <lkmaillist@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/net/bonding/bond_alb.c  |    4 +---
 drivers/net/bonding/bond_main.c |    4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff -puN drivers/net/bonding/bond_alb.c~bonding-replace-kmalloc-memset-pairs-with-the-appropriate-kzalloc-calls drivers/net/bonding/bond_alb.c
--- a/drivers/net/bonding/bond_alb.c~bonding-replace-kmalloc-memset-pairs-with-the-appropriate-kzalloc-calls
+++ a/drivers/net/bonding/bond_alb.c
@@ -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);
 	}
diff -puN drivers/net/bonding/bond_main.c~bonding-replace-kmalloc-memset-pairs-with-the-appropriate-kzalloc-calls drivers/net/bonding/bond_main.c
--- a/drivers/net/bonding/bond_main.c~bonding-replace-kmalloc-memset-pairs-with-the-appropriate-kzalloc-calls
+++ a/drivers/net/bonding/bond_main.c
@@ -1343,14 +1343,12 @@ int bond_enslave(struct net_device *bond
 			"inaccurate.\n", bond_dev->name, slave_dev->name);
 	}
 
-	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
 	 */
_

Re: [patch 05/11] bonding: Replace kmalloc() + memset() pairs with the appropriate kzalloc() calls

[David Miller]

From: akpm@linux-foundation.org
Date: Mon, 05 Feb 2007 16:31:04 -0800

> From: "Joe Jin" <lkmaillist@gmail.com>
> 
> Replace kmalloc() + memset() pairs with the appropriate kzalloc() calls in
> the bonding driver.
> 
> Signed-off-by: Joe Jin <lkmaillist@gmail.com>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

Jeff, you got this one?

Re: [patch 05/11] bonding: Replace kmalloc() + memset() pairs with the appropriate kzalloc() calls

[Jeff Garzik]

David Miller wrote:
> From: akpm@linux-foundation.org
> Date: Mon, 05 Feb 2007 16:31:04 -0800
> 
>> From: "Joe Jin" <lkmaillist@gmail.com>
>>
>> Replace kmalloc() + memset() pairs with the appropriate kzalloc() calls in
>> the bonding driver.
>>
>> Signed-off-by: Joe Jin <lkmaillist@gmail.com>
>> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> 
> Jeff, you got this one?

nope, didn't see it

Re: [patch 05/11] bonding: Replace kmalloc() + memset() pairs with the appropriate kzalloc() calls

[David Miller]

From: akpm@linux-foundation.org
Date: Mon, 05 Feb 2007 16:31:04 -0800

> From: "Joe Jin" <lkmaillist@gmail.com>
> 
> Replace kmalloc() + memset() pairs with the appropriate kzalloc() calls in
> the bonding driver.
> 
> Signed-off-by: Joe Jin <lkmaillist@gmail.com>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

Jeff asked me to take this so I have, applied, thanks.