git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
bonding: properly stop queuing work when requested
[pandora-kernel.git]
/
drivers
/
net
/
bonding
/
bond_alb.c
diff --git
a/drivers/net/bonding/bond_alb.c
b/drivers/net/bonding/bond_alb.c
index
7f8b20a
..
d4fbd2e
100644
(file)
--- 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);
}