bonding: remove bond read lock for bond_3ad_state_machine_handler()

[pandora-kernel.git] / drivers / net / bonding / bond_3ad.c

diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index 187b1b7..d6fe00b 100644 (file)
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -2068,8 +2068,10 @@ void bond_3ad_state_machine_handler(struct work_struct *work)
        struct slave *slave;
        struct port *port;
 
-       read_lock(&bond->lock);
-
+       if (!rtnl_trylock()) {
+               queue_delayed_work(bond->wq, &bond->ad_work, ad_delta_in_ticks);
+               return;
+       }
        //check if there are any slaves
        if (!bond_has_slaves(bond))
                goto re_arm;
@@ -2122,9 +2124,8 @@ void bond_3ad_state_machine_handler(struct work_struct *work)
        }
 
 re_arm:
+       rtnl_unlock();
        queue_delayed_work(bond->wq, &bond->ad_work, ad_delta_in_ticks);
-
-       read_unlock(&bond->lock);
 }
 
 /**