1 files changed, 8 insertions, 25 deletions

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 2e8ec8b79f05..ac60b697ab7e 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -2092,23 +2092,19 @@ static int bond_ioctl_change_active(struct net_device *bond_dev, struct net_devi
 
         read_lock(&bond->lock);
 
-        read_lock(&bond->curr_slave_lock);
         old_active = bond->curr_active_slave;
-        read_unlock(&bond->curr_slave_lock);
-
         new_active = bond_get_slave_by_dev(bond, slave_dev);
-
         /*
          * Changing to the current active: do nothing; return success.
          */
-        if (new_active && (new_active == old_active)) {
+        if (new_active && new_active == old_active) {
                 read_unlock(&bond->lock);
                 return 0;
         }
 
-        if ((new_active) &&
-            (old_active) &&
-            (new_active->link == BOND_LINK_UP) &&
+        if (new_active &&
+            old_active &&
+            new_active->link == BOND_LINK_UP &&
             IS_UP(new_active->dev)) {
                 block_netpoll_tx();
                 write_lock_bh(&bond->curr_slave_lock);
@@ -2660,10 +2656,7 @@ void bond_loadbalance_arp_mon(struct work_struct *work)
         if (list_empty(&bond->slave_list))
                 goto re_arm;
 
-        read_lock(&bond->curr_slave_lock);
         oldcurrent = bond->curr_active_slave;
-        read_unlock(&bond->curr_slave_lock);
-
         /* see if any of the previous devices are up now (i.e. they have
          * xmt and rcv traffic). the curr_active_slave does not come into
          * the picture unless it is null. also, slave->jiffies is not needed
@@ -3818,11 +3811,7 @@ static int bond_xmit_roundrobin(struct sk_buff *skb, struct net_device *bond_dev
          */
         if ((iph->protocol == IPPROTO_IGMP) &&
             (skb->protocol == htons(ETH_P_IP))) {
-
-                read_lock(&bond->curr_slave_lock);
                 slave = bond->curr_active_slave;
-                read_unlock(&bond->curr_slave_lock);
-
                 if (!slave)
                         goto out;
         } else {
@@ -3867,15 +3856,12 @@ out:
 static int bond_xmit_activebackup(struct sk_buff *skb, struct net_device *bond_dev)
 {
         struct bonding *bond = netdev_priv(bond_dev);
+        struct slave *slave;
         int res = 1;
 
-        read_lock(&bond->curr_slave_lock);
-
-        if (bond->curr_active_slave)
-                res = bond_dev_queue_xmit(bond, skb,
-                        bond->curr_active_slave->dev);
-
-        read_unlock(&bond->curr_slave_lock);
+        slave = bond->curr_active_slave;
+        if (slave)
+                res = bond_dev_queue_xmit(bond, skb, slave->dev);
 
         if (res)
                 /* no suitable interface, frame not sent */
@@ -3935,10 +3921,7 @@ static int bond_xmit_broadcast(struct sk_buff *skb, struct net_device *bond_dev)
         int i;
         int res = 1;
 
-        read_lock(&bond->curr_slave_lock);
         start_at = bond->curr_active_slave;
-        read_unlock(&bond->curr_slave_lock);
-
         if (!start_at)
                 goto out;