diff options
Diffstat (limited to 'drivers/net/bonding/bond_3ad.c')
-rw-r--r-- | drivers/net/bonding/bond_3ad.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c index b33c099d65a..0ae0d7c54cc 100644 --- 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) | |||
2110 | 2110 | ||
2111 | read_lock(&bond->lock); | 2111 | read_lock(&bond->lock); |
2112 | 2112 | ||
2113 | if (bond->kill_timers) | ||
2114 | goto out; | ||
2115 | |||
2116 | //check if there are any slaves | 2113 | //check if there are any slaves |
2117 | if (bond->slave_cnt == 0) | 2114 | if (bond->slave_cnt == 0) |
2118 | goto re_arm; | 2115 | goto re_arm; |
@@ -2161,9 +2158,8 @@ void bond_3ad_state_machine_handler(struct work_struct *work) | |||
2161 | } | 2158 | } |
2162 | 2159 | ||
2163 | re_arm: | 2160 | re_arm: |
2164 | if (!bond->kill_timers) | 2161 | queue_delayed_work(bond->wq, &bond->ad_work, ad_delta_in_ticks); |
2165 | queue_delayed_work(bond->wq, &bond->ad_work, ad_delta_in_ticks); | 2162 | |
2166 | out: | ||
2167 | read_unlock(&bond->lock); | 2163 | read_unlock(&bond->lock); |
2168 | } | 2164 | } |
2169 | 2165 | ||