bridge: add support for user mode STP

This patchset based on work by Aji_Srinivas@emc.com provides allows
spanning tree to be controled from userspace.  Like hotplug, it
uses call_usermodehelper when spanning tree is enabled so there
is no visible API change. If call to start usermode STP fails
it falls back to existing kernel STP.

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>

1 files changed, 3 insertions, 2 deletions

diff --git a/net/bridge/br_ioctl.c b/net/bridge/br_ioctl.c
index 147015fe5c75..eda0fbfc923a 100644
--- a/net/bridge/br_ioctl.c
+++ b/net/bridge/br_ioctl.c
@@ -137,7 +137,8 @@ static int old_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
                 b.topology_change = br->topology_change;
                 b.topology_change_detected = br->topology_change_detected;
                 b.root_port = br->root_port;
-                b.stp_enabled = br->stp_enabled;
+
+                b.stp_enabled = (br->stp_enabled != BR_NO_STP);
                 b.ageing_time = jiffies_to_clock_t(br->ageing_time);
                 b.hello_timer_value = br_timer_value(&br->hello_timer);
                 b.tcn_timer_value = br_timer_value(&br->tcn_timer);
@@ -251,7 +252,7 @@ static int old_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
                 if (!capable(CAP_NET_ADMIN))
                         return -EPERM;
 
-                br->stp_enabled = args[1]?1:0;
+                br_stp_set_enabled(br, args[1]);
                 return 0;
 
         case BRCTL_SET_BRIDGE_PRIORITY: