projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl...
[cascardo/linux.git]
/
net
/
bridge
/
br_stp_timer.c
diff --git
a/net/bridge/br_stp_timer.c
b/net/bridge/br_stp_timer.c
index
c3530a8
..
950663d
100644
(file)
--- a/
net/bridge/br_stp_timer.c
+++ b/
net/bridge/br_stp_timer.c
@@
-107,7
+107,7
@@
static void br_tcn_timer_expired(unsigned long arg)
br_debug(br, "tcn timer expired\n");
spin_lock(&br->lock);
- if (
br->dev->flags & IFF_UP
) {
+ if (
!br_is_root_bridge(br) && (br->dev->flags & IFF_UP)
) {
br_transmit_tcn(br);
mod_timer(&br->tcn_timer,jiffies + br->bridge_hello_time);