bridge: control carrier based on ports online

This makes the bridge device behave like a physical device.
In earlier releases the bridge always asserted carrier. This
changes the behavior so that bridge device carrier is on only
if one or more ports are in the forwarding state. This
should help IPv6 autoconfiguration, DHCP, and routing daemons.

I did brief testing with Network and Virt manager and they
seem fine, but since this changes behavior of bridge, it should
wait until net-next (2.6.39).

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Reviewed-by: Nicolas de Pesloüan <nicolas.2p.debian@free.fr>
Tested-By: Adam Majer <adamm@zombino.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
index 1461b19efd38255292f695c496ad5258222be028..21e5901186eaca009d0f13a2a5754ec362096671 100644 (file)
--- a/net/bridge/br_device.c
+++ b/net/bridge/br_device.c
@@ -78,6 +78,8 @@ static int br_dev_open(struct net_device *dev)
 {
        struct net_bridge *br = netdev_priv(dev);
 
+       netif_carrier_off(dev);
+
        br_features_recompute(br);
        netif_start_queue(dev);
        br_stp_enable_bridge(br);
@@ -94,6 +96,8 @@ static int br_dev_stop(struct net_device *dev)
 {
        struct net_bridge *br = netdev_priv(dev);
 
+       netif_carrier_off(dev);
+
        br_stp_disable_bridge(br);
        br_multicast_stop(br);
 

diff --git a/net/bridge/br_stp.c b/net/bridge/br_stp.c
index 57186d84d2bd6497366d7d4d7cca7a694e0b5818..a5badd0f82260c630a7f53f176fc218fe1c85eaa 100644 (file)
--- a/net/bridge/br_stp.c
+++ b/net/bridge/br_stp.c
@@ -397,28 +397,37 @@ static void br_make_forwarding(struct net_bridge_port *p)
 void br_port_state_selection(struct net_bridge *br)
 {
        struct net_bridge_port *p;
+       unsigned int liveports = 0;
 
        /* Don't change port states if userspace is handling STP */
        if (br->stp_enabled == BR_USER_STP)
                return;
 
        list_for_each_entry(p, &br->port_list, list) {
-               if (p->state != BR_STATE_DISABLED) {
-                       if (p->port_no == br->root_port) {
-                               p->config_pending = 0;
-                               p->topology_change_ack = 0;
-                               br_make_forwarding(p);
-                       } else if (br_is_designated_port(p)) {
-                               del_timer(&p->message_age_timer);
-                               br_make_forwarding(p);
-                       } else {
-                               p->config_pending = 0;
-                               p->topology_change_ack = 0;
-                               br_make_blocking(p);
-                       }
+               if (p->state == BR_STATE_DISABLED)
+                       continue;
+
+               if (p->port_no == br->root_port) {
+                       p->config_pending = 0;
+                       p->topology_change_ack = 0;
+                       br_make_forwarding(p);
+               } else if (br_is_designated_port(p)) {
+                       del_timer(&p->message_age_timer);
+                       br_make_forwarding(p);
+               } else {
+                       p->config_pending = 0;
+                       p->topology_change_ack = 0;
+                       br_make_blocking(p);
                }
 
+               if (p->state == BR_STATE_FORWARDING)
+                       ++liveports;
        }
+
+       if (liveports == 0)
+               netif_carrier_off(br->dev);
+       else
+               netif_carrier_on(br->dev);
 }
 
 /* called under bridge lock */

diff --git a/net/bridge/br_stp_timer.c b/net/bridge/br_stp_timer.c
index 7b22456023c5615642b3c1a786bc135065aeb990..3e965140051e79ad146cc41bd0da78f93d26d476 100644 (file)
--- a/net/bridge/br_stp_timer.c
+++ b/net/bridge/br_stp_timer.c
@@ -94,6 +94,7 @@ static void br_forward_delay_timer_expired(unsigned long arg)
                p->state = BR_STATE_FORWARDING;
                if (br_is_designated_for_some_port(br))
                        br_topology_change_detection(br);
+               netif_carrier_on(br->dev);
        }
        br_log_state(p);
        spin_unlock(&br->lock);