1 files changed, 31 insertions, 48 deletions

diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index 855dc10ffa1b..7a06ade85b02 100644
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -229,7 +229,7 @@ static ssize_t bonding_show_slaves(struct device *d,
         int i, res = 0;
         struct bonding *bond = to_bond(d);
 
-        read_lock_bh(&bond->lock);
+        read_lock(&bond->lock);
         bond_for_each_slave(bond, slave, i) {
                 if (res > (PAGE_SIZE - IFNAMSIZ)) {
                         /* not enough space for another interface name */
@@ -240,7 +240,7 @@ static ssize_t bonding_show_slaves(struct device *d,
                 }
                 res += sprintf(buf + res, "%s ", slave->dev->name);
         }
-        read_unlock_bh(&bond->lock);
+        read_unlock(&bond->lock);
         res += sprintf(buf + res, "\n");
         res++;
         return res;
@@ -282,18 +282,18 @@ static ssize_t bonding_store_slaves(struct device *d,
 
                 /* Got a slave name in ifname.  Is it already in the list? */
                 found = 0;
-                read_lock_bh(&bond->lock);
+                read_lock(&bond->lock);
                 bond_for_each_slave(bond, slave, i)
                         if (strnicmp(slave->dev->name, ifname, IFNAMSIZ) == 0) {
                                 printk(KERN_ERR DRV_NAME
                                        ": %s: Interface %s is already enslaved!\n",
                                        bond->dev->name, ifname);
                                 ret = -EPERM;
-                                read_unlock_bh(&bond->lock);
+                                read_unlock(&bond->lock);
                                 goto out;
                         }
 
-                read_unlock_bh(&bond->lock);
+                read_unlock(&bond->lock);
                 printk(KERN_INFO DRV_NAME ": %s: Adding slave %s.\n",
                        bond->dev->name, ifname);
                 dev = dev_get_by_name(&init_net, ifname);
@@ -662,12 +662,9 @@ static ssize_t bonding_store_arp_interval(struct device *d,
                        "%s Disabling MII monitoring.\n",
                        bond->dev->name, bond->dev->name);
                 bond->params.miimon = 0;
-                /* Kill MII timer, else it brings bond's link down */
-                if (bond->arp_timer.function) {
-                        printk(KERN_INFO DRV_NAME
-                        ": %s: Kill MII timer, else it brings bond's link down...\n",
-                       bond->dev->name);
-                        del_timer_sync(&bond->mii_timer);
+                if (delayed_work_pending(&bond->mii_work)) {
+                        cancel_delayed_work(&bond->mii_work);
+                        flush_workqueue(bond->wq);
                 }
         }
         if (!bond->params.arp_targets[0]) {
@@ -682,25 +679,15 @@ static ssize_t bonding_store_arp_interval(struct device *d,
                  * timer will get fired off when the open function
                  * is called.
                  */
-                if (bond->arp_timer.function) {
-                        /* The timer's already set up, so fire it off */
-                        mod_timer(&bond->arp_timer, jiffies + 1);
-                } else {
-                        /* Set up the timer. */
-                        init_timer(&bond->arp_timer);
-                        bond->arp_timer.expires = jiffies + 1;
-                        bond->arp_timer.data =
-                                (unsigned long) bond->dev;
-                        if (bond->params.mode == BOND_MODE_ACTIVEBACKUP) {
-                                bond->arp_timer.function =
-                                        (void *)
-                                        &bond_activebackup_arp_mon;
-                        } else {
-                                bond->arp_timer.function =
-                                        (void *)
-                                        &bond_loadbalance_arp_mon;
-                        }
-                        add_timer(&bond->arp_timer);
+                if (!delayed_work_pending(&bond->arp_work)) {
+                        if (bond->params.mode == BOND_MODE_ACTIVEBACKUP)
+                                INIT_DELAYED_WORK(&bond->arp_work,
+                                                  bond_activebackup_arp_mon);
+                        else
+                                INIT_DELAYED_WORK(&bond->arp_work,
+                                                  bond_loadbalance_arp_mon);
+
+                        queue_delayed_work(bond->wq, &bond->arp_work, 0);
                 }
         }
 
@@ -1056,12 +1043,9 @@ static ssize_t bonding_store_miimon(struct device *d,
                                 bond->params.arp_validate =
                                         BOND_ARP_VALIDATE_NONE;
                         }
-                        /* Kill ARP timer, else it brings bond's link down */
-                        if (bond->mii_timer.function) {
-                                printk(KERN_INFO DRV_NAME
-                                ": %s: Kill ARP timer, else it brings bond's link down...\n",
-                               bond->dev->name);
-                                del_timer_sync(&bond->arp_timer);
+                        if (delayed_work_pending(&bond->arp_work)) {
+                                cancel_delayed_work(&bond->arp_work);
+                                flush_workqueue(bond->wq);
                         }
                 }
 
@@ -1071,18 +1055,11 @@ static ssize_t bonding_store_miimon(struct device *d,
                          * timer will get fired off when the open function
                          * is called.
                          */
-                        if (bond->mii_timer.function) {
-                                /* The timer's already set up, so fire it off */
-                                mod_timer(&bond->mii_timer, jiffies + 1);
-                        } else {
-                                /* Set up the timer. */
-                                init_timer(&bond->mii_timer);
-                                bond->mii_timer.expires = jiffies + 1;
-                                bond->mii_timer.data =
-                                        (unsigned long) bond->dev;
-                                bond->mii_timer.function =
-                                        (void *) &bond_mii_monitor;
-                                add_timer(&bond->mii_timer);
+                        if (!delayed_work_pending(&bond->mii_work)) {
+                                INIT_DELAYED_WORK(&bond->mii_work,
+                                                  bond_mii_monitor);
+                                queue_delayed_work(bond->wq,
+                                                   &bond->mii_work, 0);
                         }
                 }
         }
@@ -1156,6 +1133,9 @@ static ssize_t bonding_store_primary(struct device *d,
         }
 out:
         write_unlock_bh(&bond->lock);
+
+        rtnl_unlock();
+
         return count;
 }
 static DEVICE_ATTR(primary, S_IRUGO | S_IWUSR, bonding_show_primary, bonding_store_primary);
@@ -1213,6 +1193,7 @@ static ssize_t bonding_show_active_slave(struct device *d,
         struct bonding *bond = to_bond(d);
         int count;
 
+        rtnl_lock();
 
         read_lock(&bond->curr_slave_lock);
         curr = bond->curr_active_slave;
@@ -1292,6 +1273,8 @@ static ssize_t bonding_store_active_slave(struct device *d,
         }
 out:
         write_unlock_bh(&bond->lock);
+        rtnl_unlock();
+
         return count;
 
 }