Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

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);