1 files changed, 56 insertions, 3 deletions

diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c
index a285897a2fb4..3e246b37020e 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;
@@ -123,6 +120,62 @@ void br_stp_disable_port(struct net_bridge_port *p)
                 br_become_root_bridge(br);
 }
 
+static void br_stp_start(struct net_bridge *br)
+{
+        int r;
+        char *argv[] = { BR_STP_PROG, br->dev->name, "start", NULL };
+        char *envp[] = { NULL };
+
+        r = call_usermodehelper(BR_STP_PROG, argv, envp, 1);
+        if (r == 0) {
+                br->stp_enabled = BR_USER_STP;
+                printk(KERN_INFO "%s: userspace STP started\n", br->dev->name);
+        } else {
+                br->stp_enabled = BR_KERNEL_STP;
+                printk(KERN_INFO "%s: starting userspace STP failed, "
+                                "staring kernel STP\n", br->dev->name);
+
+                /* To start timers on any ports left in blocking */
+                spin_lock_bh(&br->lock);
+                br_port_state_selection(br);
+                spin_unlock_bh(&br->lock);
+        }
+}
+
+static void br_stp_stop(struct net_bridge *br)
+{
+        int r;
+        char *argv[] = { BR_STP_PROG, br->dev->name, "stop", NULL };
+        char *envp[] = { NULL };
+
+        if (br->stp_enabled == BR_USER_STP) {
+                r = call_usermodehelper(BR_STP_PROG, argv, envp, 1);
+                printk(KERN_INFO "%s: userspace STP stopped, return code %d\n",
+                        br->dev->name, r);
+
+
+                /* To start timers on any ports left in blocking */
+                spin_lock_bh(&br->lock);
+                br_port_state_selection(br);
+                spin_unlock_bh(&br->lock);
+        }
+
+        br->stp_enabled = BR_NO_STP;
+}
+
+void br_stp_set_enabled(struct net_bridge *br, unsigned long val)
+{
+        ASSERT_RTNL();
+
+        if (val) {
+                if (br->stp_enabled == BR_NO_STP)
+                        br_stp_start(br);
+        } else {
+                if (br->stp_enabled != BR_NO_STP)
+                        br_stp_stop(br);
+        }
+}
+
 /* called under bridge lock */
 void br_stp_change_bridge_id(struct net_bridge *br, const unsigned char *addr)
 {