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
Merge branch 'topic/asoc' into for-linus
[pandora-kernel.git]
/
net
/
bridge
/
br_stp.c
diff --git
a/net/bridge/br_stp.c
b/net/bridge/br_stp.c
index
6e63ec3
..
0660515
100644
(file)
--- a/
net/bridge/br_stp.c
+++ b/
net/bridge/br_stp.c
@@
-297,6
+297,9
@@
void br_topology_change_detection(struct net_bridge *br)
{
int isroot = br_is_root_bridge(br);
+ if (br->stp_enabled != BR_KERNEL_STP)
+ return;
+
pr_info("%s: topology change detected, %s\n", br->dev->name,
isroot ? "propagating" : "sending tcn bpdu");