From 8b804a15672f45386e7f68fac5414c2eb83079dd Mon Sep 17 00:00:00 2001
From: stephen hemminger <shemminger@vyatta.com>
Date: Fri, 22 Jul 2011 07:47:09 +0000
Subject: [PATCH] --- yaml --- r: 258431 b: refs/heads/master c:
 4ecb961c8b474ebef5aff55f715c7875e69dd57b h: refs/heads/master i:   258429:
 652cb892ab5135dcf6c6782846dc0dceda497be3   258427:
 f666987bdcc957e5495e3dbd2e008e6de54ac5ae   258423:
 976c394ee7642d1865452bcafe6e1643611f0726   258415:
 25e601a07ce089462711d7b65299143b7b782842   258399:
 6370d935aa3e73fc53e2aa02ea3d6f1d472d9d9e   258367:
 cf0a58d7a8083b2494aa5faf626183783fd501e6   258303:
 1cd06c0eda9ddf00f4dd263debe5d06b5e163c0c v: v3

---
 [refs]                          | 2 +-
 trunk/net/bridge/br_netlink.c   | 2 ++
 trunk/net/bridge/br_stp.c       | 4 +++-
 trunk/net/bridge/br_stp_if.c    | 3 +++
 trunk/net/bridge/br_stp_timer.c | 1 +
 5 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d1c335f8f46b..74342964a285 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 56139fc5bd6e740706993ab3ad0d0aeff69a8479
+refs/heads/master: 4ecb961c8b474ebef5aff55f715c7875e69dd57b
diff --git a/trunk/net/bridge/br_netlink.c b/trunk/net/bridge/br_netlink.c
index 6814083a92f4..5b1ed1ba9aa7 100644
--- a/trunk/net/bridge/br_netlink.c
+++ b/trunk/net/bridge/br_netlink.c
@@ -188,6 +188,8 @@ static int br_rtm_setlink(struct sk_buff *skb,  struct nlmsghdr *nlh, void *arg)
 
 	p->state = new_state;
 	br_log_state(p);
+	br_ifinfo_notify(RTM_NEWLINK, p);
+
 	return 0;
 }
 
diff --git a/trunk/net/bridge/br_stp.c b/trunk/net/bridge/br_stp.c
index fcff62251547..4d651af57a90 100644
--- a/trunk/net/bridge/br_stp.c
+++ b/trunk/net/bridge/br_stp.c
@@ -363,6 +363,8 @@ static void br_make_blocking(struct net_bridge_port *p)
 
 		p->state = BR_STATE_BLOCKING;
 		br_log_state(p);
+		br_ifinfo_notify(RTM_NEWLINK, p);
+
 		del_timer(&p->forward_delay_timer);
 	}
 }
@@ -386,8 +388,8 @@ static void br_make_forwarding(struct net_bridge_port *p)
 		p->state = BR_STATE_LEARNING;
 
 	br_multicast_enable_port(p);
-
 	br_log_state(p);
+	br_ifinfo_notify(RTM_NEWLINK, p);
 
 	if (br->forward_delay != 0)
 		mod_timer(&p->forward_delay_timer, jiffies + br->forward_delay);
diff --git a/trunk/net/bridge/br_stp_if.c b/trunk/net/bridge/br_stp_if.c
index 6f615b8192f4..10eda3cd1d71 100644
--- a/trunk/net/bridge/br_stp_if.c
+++ b/trunk/net/bridge/br_stp_if.c
@@ -88,6 +88,7 @@ void br_stp_enable_port(struct net_bridge_port *p)
 	br_init_port(p);
 	br_port_state_selection(p->br);
 	br_log_state(p);
+	br_ifinfo_notify(RTM_NEWLINK, p);
 }
 
 /* called under bridge lock */
@@ -104,6 +105,8 @@ void br_stp_disable_port(struct net_bridge_port *p)
 	p->topology_change_ack = 0;
 	p->config_pending = 0;
 
+	br_ifinfo_notify(RTM_NEWLINK, p);
+
 	del_timer(&p->message_age_timer);
 	del_timer(&p->forward_delay_timer);
 	del_timer(&p->hold_timer);
diff --git a/trunk/net/bridge/br_stp_timer.c b/trunk/net/bridge/br_stp_timer.c
index 3e965140051e..58de2a0f9975 100644
--- a/trunk/net/bridge/br_stp_timer.c
+++ b/trunk/net/bridge/br_stp_timer.c
@@ -97,6 +97,7 @@ static void br_forward_delay_timer_expired(unsigned long arg)
 		netif_carrier_on(br->dev);
 	}
 	br_log_state(p);
+	br_ifinfo_notify(RTM_NEWLINK, p);
 	spin_unlock(&br->lock);
 }