3 files changed, 13 insertions, 7 deletions

diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index cf10b8f2a1..690573bbf0 100644
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -152,6 +152,8 @@ static void del_nbp(struct net_bridge_port *p)
         br_stp_disable_port(p);
         spin_unlock_bh(&br->lock);
 
+        br_ifinfo_notify(RTM_DELLINK, p);
+
         br_fdb_delete_by_port(br, p, 1);
 
         list_del_rcu(&p->list);
@@ -434,6 +436,8 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
                 br_stp_enable_port(p);
         spin_unlock_bh(&br->lock);
 
+        br_ifinfo_notify(RTM_NEWLINK, p);
+
         dev_set_mtu(br->dev, br_min_mtu(br));
 
         kobject_uevent(&p->kobj, KOBJ_ADD);
diff --git a/net/bridge/br_notify.c b/net/bridge/br_notify.c
index 37357ed214..c8451d3a07 100644
--- a/net/bridge/br_notify.c
+++ b/net/bridge/br_notify.c
@@ -50,7 +50,6 @@ static int br_device_event(struct notifier_block *unused, unsigned long event, v
         case NETDEV_CHANGEADDR:
                 spin_lock_bh(&br->lock);
                 br_fdb_changeaddr(p, dev->dev_addr);
-                br_ifinfo_notify(RTM_NEWLINK, p);
                 br_stp_recalculate_bridge_id(br);
                 spin_unlock_bh(&br->lock);
                 break;
@@ -74,10 +73,11 @@ static int br_device_event(struct notifier_block *unused, unsigned long event, v
                 break;
 
         case NETDEV_UP:
-                spin_lock_bh(&br->lock);
-                if (netif_carrier_ok(dev) && (br->dev->flags & IFF_UP))
+                if (netif_carrier_ok(dev) && (br->dev->flags & IFF_UP)) {
+                        spin_lock_bh(&br->lock);
                         br_stp_enable_port(p);
-                spin_unlock_bh(&br->lock);
+                        spin_unlock_bh(&br->lock);
+                }
                 break;
 
         case NETDEV_UNREGISTER:
@@ -85,5 +85,10 @@ static int br_device_event(struct notifier_block *unused, unsigned long event, v
                 break;
         }
 
+        /* Events that may cause spanning tree to refresh */
+        if (event == NETDEV_CHANGEADDR || event == NETDEV_UP ||
+            event == NETDEV_CHANGE || event == NETDEV_DOWN)
+                br_ifinfo_notify(RTM_NEWLINK, p);
+
         return NOTIFY_DONE;
 }
diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c
index 1c1806d7c4..3e246b3702 100644
--- a/net/bridge/br_stp_if.c
+++ b/net/bridge/br_stp_if.c
@@ -87,7 +87,6 @@ void br_stp_disable_bridge(struct net_bridge *br)
 void br_stp_enable_port(struct net_bridge_port *p)
 {
         br_init_port(p);
-        br_ifinfo_notify(RTM_NEWLINK, p);
         br_port_state_selection(p->br);
 }
 
@@ -101,8 +100,6 @@ void br_stp_disable_port(struct net_bridge_port *p)
         printk(KERN_INFO "%s: port %i(%s) entering %s state\n",
                br->dev->name, p->port_no, p->dev->name, "disabled");
 
-        br_ifinfo_notify(RTM_DELLINK, p);
-
         wasroot = br_is_root_bridge(br);
         br_become_designated_port(p);
         p->state = BR_STATE_DISABLED;