3 files changed, 10 insertions, 16 deletions

diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index 8f2d2e7c70e5..2df9276720a0 100644
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -163,8 +163,6 @@ static int tlb_initialize(struct bonding *bond)
         struct tlb_client_info *new_hashtbl;
         int i;
 
-        spin_lock_init(&(bond_info->tx_hashtbl_lock));
-
         new_hashtbl = kzalloc(size, GFP_KERNEL);
         if (!new_hashtbl) {
                 pr_err("%s: Error: Failed to allocate TLB hash table\n",
@@ -747,8 +745,6 @@ static int rlb_initialize(struct bonding *bond)
         int size = RLB_HASH_TABLE_SIZE * sizeof(struct rlb_client_info);
         int i;
 
-        spin_lock_init(&(bond_info->rx_hashtbl_lock));
-
         new_hashtbl = kmalloc(size, GFP_KERNEL);
         if (!new_hashtbl) {
                 pr_err("%s: Error: Failed to allocate RLB hash table\n",
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 6dc428461541..9ec4a505a79f 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1542,12 +1542,6 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
                            bond_dev->name, slave_dev->name);
         }
 
-        /* bond must be initialized by bond_open() before enslaving */
-        if (!(bond_dev->flags & IFF_UP)) {
-                pr_warning("%s: master_dev is not up in bond_enslave\n",
-                           bond_dev->name);
-        }
-
         /* already enslaved */
         if (slave_dev->flags & IFF_SLAVE) {
                 pr_debug("Error, Device was already enslaved\n");
@@ -4834,9 +4828,19 @@ static int bond_init(struct net_device *bond_dev)
 {
         struct bonding *bond = netdev_priv(bond_dev);
         struct bond_net *bn = net_generic(dev_net(bond_dev), bond_net_id);
+        struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond));
 
         pr_debug("Begin bond_init for %s\n", bond_dev->name);
 
+        /*
+         * Initialize locks that may be required during
+         * en/deslave operations.  All of the bond_open work
+         * (of which this is part) should really be moved to
+         * a phase prior to dev_open
+         */
+        spin_lock_init(&(bond_info->tx_hashtbl_lock));
+        spin_lock_init(&(bond_info->rx_hashtbl_lock));
+
         bond->wq = create_singlethread_workqueue(bond_dev->name);
         if (!bond->wq)
                 return -ENOMEM;
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index 4059bfc73dbf..bb1319f9f173 100644
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -227,12 +227,6 @@ static ssize_t bonding_store_slaves(struct device *d,
         struct net_device *dev;
         struct bonding *bond = to_bond(d);
 
-        /* Quick sanity check -- is the bond interface up? */
-        if (!(bond->dev->flags & IFF_UP)) {
-                pr_warning("%s: doing slave updates when interface is down.\n",
-                           bond->dev->name);
-        }
-
         if (!rtnl_trylock())
                 return restart_syscall();