diff options
| author | stephen hemminger <shemminger@vyatta.com> | 2011-03-07 08:34:06 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-14 14:29:02 -0700 |
| commit | 1faa4356a3bd89ea11fb92752d897cff3a20ec0e (patch) | |
| tree | 31bf972b0ee42105bceb79e09f2a8b82d9d9b942 /net/bridge/br_stp_timer.c | |
| parent | 942527634e201883b39fe0c97a1e47db7a026f91 (diff) | |
| download | blackbird-op-linux-1faa4356a3bd89ea11fb92752d897cff3a20ec0e.tar.gz blackbird-op-linux-1faa4356a3bd89ea11fb92752d897cff3a20ec0e.zip | |
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>
Diffstat (limited to 'net/bridge/br_stp_timer.c')
| -rw-r--r-- | net/bridge/br_stp_timer.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bridge/br_stp_timer.c b/net/bridge/br_stp_timer.c index 7b22456023c5..3e965140051e 100644 --- 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); |
