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>

1 files changed, 3 insertions, 3 deletions

diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index 37fe693471a8..1edd71d44a4c 100644
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -66,14 +66,14 @@ void br_port_carrier_check(struct net_bridge_port *p)
         struct net_device *dev = p->dev;
         struct net_bridge *br = p->br;
 
-        if (netif_running(dev) && netif_carrier_ok(dev))
+        if (netif_running(dev) && netif_oper_up(dev))
                 p->path_cost = port_cost(dev);
 
         if (!netif_running(br->dev))
                 return;
 
         spin_lock_bh(&br->lock);
-        if (netif_running(dev) && netif_carrier_ok(dev)) {
+        if (netif_running(dev) && netif_oper_up(dev)) {
                 if (p->state == BR_STATE_DISABLED)
                         br_stp_enable_port(p);
         } else {
@@ -383,7 +383,7 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
         spin_lock_bh(&br->lock);
         changed_addr = br_stp_recalculate_bridge_id(br);
 
-        if ((dev->flags & IFF_UP) && netif_carrier_ok(dev) &&
+        if (netif_running(dev) && netif_oper_up(dev) &&
             (br->dev->flags & IFF_UP))
                 br_stp_enable_port(p);
         spin_unlock_bh(&br->lock);