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
Pull thermal into release branch
[pandora-kernel.git]
/
net
/
bridge
/
br_stp_timer.c
diff --git
a/net/bridge/br_stp_timer.c
b/net/bridge/br_stp_timer.c
index
24e0ca4
..
77f5255
100644
(file)
--- a/
net/bridge/br_stp_timer.c
+++ b/
net/bridge/br_stp_timer.c
@@
-42,7
+42,7
@@
static void br_hello_timer_expired(unsigned long arg)
if (br->dev->flags & IFF_UP) {
br_config_bpdu_generation(br);
- mod_timer(&br->hello_timer,
jiffies + br->hello_time
);
+ mod_timer(&br->hello_timer,
round_jiffies(jiffies + br->hello_time)
);
}
spin_unlock(&br->lock);
}