[BONDING]: Replace kmalloc() + memset() pairs with the appropriate kzalloc() calls

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>

2 files changed, 2 insertions, 6 deletions

diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index 32923162179e..217a2eedee0a 100644
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -184,7 +184,7 @@ static int tlb_initialize(struct bonding *bond)
 
         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)
 
         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 --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index d3801a00d3d5..8ce8fec615ba 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1343,14 +1343,12 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
                         "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
          */