diff options
| author | stephen hemminger <shemminger@vyatta.com> | 2012-12-28 18:15:22 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-12-30 02:31:43 -0800 |
| commit | 576eb62598f10c8c7fd75703fe89010cdcfff596 (patch) | |
| tree | 47317f7bc68dc06ad06735eb7c9ba4e271dcd793 /net/bridge/br_stp_if.c | |
| parent | aa1113d9f85da59dcbdd32aeb5d71da566e46def (diff) | |
| download | blackbird-op-linux-576eb62598f10c8c7fd75703fe89010cdcfff596.tar.gz blackbird-op-linux-576eb62598f10c8c7fd75703fe89010cdcfff596.zip | |
bridge: respect RFC2863 operational state
The bridge link detection should follow the operational state
of the lower device, rather than the carrier bit. This allows devices
like tunnels that are controlled by userspace control plane to work
with bridge STP link management.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Reviewed-by: Flavio Leitner <fbl@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_stp_if.c')
| -rw-r--r-- | net/bridge/br_stp_if.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c index 9d5a414a3943..7b5197c7de13 100644 --- a/net/bridge/br_stp_if.c +++ b/net/bridge/br_stp_if.c @@ -54,7 +54,7 @@ void br_stp_enable_bridge(struct net_bridge *br) br_config_bpdu_generation(br); list_for_each_entry(p, &br->port_list, list) { - if ((p->dev->flags & IFF_UP) && netif_carrier_ok(p->dev)) + if (netif_running(p->dev) && netif_oper_up(p->dev)) br_stp_enable_port(p); } |
