Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

[pandora-kernel.git] / net / bridge / br_ioctl.c

diff --git a/net/bridge/br_ioctl.c b/net/bridge/br_ioctl.c
index 3d9fca0..7222fe1 100644 (file)
--- a/net/bridge/br_ioctl.c
+++ b/net/bridge/br_ioctl.c
@@ -181,40 +181,19 @@ static int old_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
                if (!capable(CAP_NET_ADMIN))
                        return -EPERM;
 
-               spin_lock_bh(&br->lock);
-               br->bridge_forward_delay = clock_t_to_jiffies(args[1]);
-               if (br_is_root_bridge(br))
-                       br->forward_delay = br->bridge_forward_delay;
-               spin_unlock_bh(&br->lock);
-               return 0;
+               return br_set_forward_delay(br, args[1]);
 
        case BRCTL_SET_BRIDGE_HELLO_TIME:
-       {
-               unsigned long t = clock_t_to_jiffies(args[1]);
                if (!capable(CAP_NET_ADMIN))
                        return -EPERM;
 
-               if (t < HZ)
-                       return -EINVAL;
-
-               spin_lock_bh(&br->lock);
-               br->bridge_hello_time = t;
-               if (br_is_root_bridge(br))
-                       br->hello_time = br->bridge_hello_time;
-               spin_unlock_bh(&br->lock);
-               return 0;
-       }
+               return br_set_hello_time(br, args[1]);
 
        case BRCTL_SET_BRIDGE_MAX_AGE:
                if (!capable(CAP_NET_ADMIN))
                        return -EPERM;
 
-               spin_lock_bh(&br->lock);
-               br->bridge_max_age = clock_t_to_jiffies(args[1]);
-               if (br_is_root_bridge(br))
-                       br->max_age = br->bridge_max_age;
-               spin_unlock_bh(&br->lock);
-               return 0;
+               return br_set_max_age(br, args[1]);
 
        case BRCTL_SET_AGEING_TIME:
                if (!capable(CAP_NET_ADMIN))
@@ -275,19 +254,16 @@ static int old_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
        case BRCTL_SET_PORT_PRIORITY:
        {
                struct net_bridge_port *p;
-               int ret = 0;
+               int ret;
 
                if (!capable(CAP_NET_ADMIN))
                        return -EPERM;
 
-               if (args[2] >= (1<<(16-BR_PORT_BITS)))
-                       return -ERANGE;
-
                spin_lock_bh(&br->lock);
                if ((p = br_get_port(br, args[1])) == NULL)
                        ret = -EINVAL;
                else
-                       br_stp_set_port_priority(p, args[2]);
+                       ret = br_stp_set_port_priority(p, args[2]);
                spin_unlock_bh(&br->lock);
                return ret;
        }
@@ -295,15 +271,17 @@ static int old_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
        case BRCTL_SET_PATH_COST:
        {
                struct net_bridge_port *p;
-               int ret = 0;
+               int ret;
 
                if (!capable(CAP_NET_ADMIN))
                        return -EPERM;
 
+               spin_lock_bh(&br->lock);
                if ((p = br_get_port(br, args[1])) == NULL)
                        ret = -EINVAL;
                else
-                       br_stp_set_path_cost(p, args[2]);
+                       ret = br_stp_set_path_cost(p, args[2]);
+               spin_unlock_bh(&br->lock);
 
                return ret;
        }