bonding: eliminate bond_close race conditions

[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 b33c099..0ae0d7c 100644 (file)
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -2110,9 +2110,6 @@ void bond_3ad_state_machine_handler(struct work_struct *work)
 
        read_lock(&bond->lock);
 
-       if (bond->kill_timers)
-               goto out;
-
        //check if there are any slaves
        if (bond->slave_cnt == 0)
                goto re_arm;
@@ -2161,9 +2158,8 @@ void bond_3ad_state_machine_handler(struct work_struct *work)
        }
 
 re_arm:
-       if (!bond->kill_timers)
-               queue_delayed_work(bond->wq, &bond->ad_work, ad_delta_in_ticks);
-out:
+       queue_delayed_work(bond->wq, &bond->ad_work, ad_delta_in_ticks);
+
        read_unlock(&bond->lock);
 }