diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-17 11:22:50 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-17 11:22:50 +0000 |
| commit | 8eb41582d2106eccc7717047d1184481f5a1b3a6 (patch) | |
| tree | 12257bbe39b5c8ae6918198fde682ed0aacd8e00 /drivers/net/bonding/bond_alb.c | |
| parent | 127d4eb97b7bebc15fd692603263e75c220e24f9 (diff) | |
| parent | 1cb17e2dbd09436069733500ea48e0c9b1f0a1cc (diff) | |
| download | op-kernel-dev-8eb41582d2106eccc7717047d1184481f5a1b3a6.zip op-kernel-dev-8eb41582d2106eccc7717047d1184481f5a1b3a6.tar.gz | |
Merge branch 'ep93xx/board' into next/board
Diffstat (limited to 'drivers/net/bonding/bond_alb.c')
| -rw-r--r-- | drivers/net/bonding/bond_alb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c index 7f8b20a3..d4fbd2e 100644 --- a/drivers/net/bonding/bond_alb.c +++ b/drivers/net/bonding/bond_alb.c @@ -1440,7 +1440,8 @@ void bond_alb_monitor(struct work_struct *work) } re_arm: - queue_delayed_work(bond->wq, &bond->alb_work, alb_delta_in_ticks); + if (!bond->kill_timers) + queue_delayed_work(bond->wq, &bond->alb_work, alb_delta_in_ticks); out: read_unlock(&bond->lock); } |
