Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (79 commits)
  [IPX]: Fix NULL pointer dereference on ipx unload
  [ATM]: atmarp.h needs to always include linux/types.h
  [NET]: Fix net/socket.c warnings.
  [NET]: cleanup sock_from_file()
  [NET]: change layout of ehash table
  [S390]: Add AF_IUCV socket support
  [S390]: Adapt special message interface to new IUCV API
  [S390]: Adapt netiucv driver to new IUCV API
  [S390]: Adapt vmlogrdr driver to new IUCV API
  [S390]: Adapt monreader driver to new IUCV API
  [S390]: Rewrite of the IUCV base code, part 2
  [S390]: Rewrite of the IUCV base code, part 1
  [X.25]: Adds /proc/net/x25/forward to view active forwarded calls.
  [X.25]: Adds /proc/sys/net/x25/x25_forward to control forwarding.
  [X.25]: Add call forwarding
  [XFRM]: xfrm_migrate() needs exporting to modules.
  [PFKEYV2]: CONFIG_NET_KEY_MIGRATE option
  [PFKEYV2]: Extension for dynamic update of endpoint address(es)
  [XFRM]: CONFIG_XFRM_MIGRATE option
  [XFRM]: User interface for handling XFRM_MSG_MIGRATE
  ...

4 files changed, 4 insertions, 11 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
          */
diff --git a/drivers/net/slip.c b/drivers/net/slip.c
index a0806d262fc6..2f4b1de7a2b4 100644
--- a/drivers/net/slip.c
+++ b/drivers/net/slip.c
@@ -1343,15 +1343,12 @@ static int __init slip_init(void)
         printk(KERN_INFO "SLIP linefill/keepalive option.\n");
 #endif
 
-        slip_devs = kmalloc(sizeof(struct net_device *)*slip_maxdev, GFP_KERNEL);
+        slip_devs = kzalloc(sizeof(struct net_device *)*slip_maxdev, GFP_KERNEL);
         if (!slip_devs) {
                 printk(KERN_ERR "SLIP: Can't allocate slip devices array!  Uaargh! (-> No SLIP available)\n");
                 return -ENOMEM;
         }
 
-        /* Clear the pointer array, we allocate devices when we need them */
-        memset(slip_devs, 0, sizeof(struct net_device *)*slip_maxdev);
-
         /* Fill in our line protocol discipline, and register it */
         if ((status = tty_register_ldisc(N_SLIP, &sl_ldisc)) != 0)  {
                 printk(KERN_ERR "SLIP: can't register line discipline (err = %d)\n", status);
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 135c0987deae..e136bae61970 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -3380,7 +3380,7 @@ next_pkt:
                 }
 next_pkt_nopost:
                 sw_idx++;
-                sw_idx %= TG3_RX_RCB_RING_SIZE(tp);
+                sw_idx &= (TG3_RX_RCB_RING_SIZE(tp) - 1);
 
                 /* Refresh hw_idx to see if there is new work */
                 if (sw_idx == hw_idx) {