diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2009-06-08 13:21:27 +0200 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-06-08 13:21:27 +0200 |
| commit | e635a01ea0a16cf7cd31ecd2305870385dca9be6 (patch) | |
| tree | c7153e7dee5caf6ac90d85694ff27e4d0b606290 /net/bridge/br_stp.c | |
| parent | mtd: physmap_of: Add multiple regions and concatenation support (diff) | |
| parent | [MTD] [NAND] S3C2410: Use DIV_ROUND_UP (diff) | |
| download | linux-e635a01ea0a16cf7cd31ecd2305870385dca9be6.tar.xz linux-e635a01ea0a16cf7cd31ecd2305870385dca9be6.zip | |
Merge branch 'next-mtd' of git://aeryn.fluff.org.uk/bjdooks/linux
Diffstat (limited to 'net/bridge/br_stp.c')
| -rw-r--r-- | net/bridge/br_stp.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/bridge/br_stp.c b/net/bridge/br_stp.c index 6e63ec3f1fcf..0660515f3992 100644 --- 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"); |