Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net...

[cascardo/linux.git] / net / bridge / br_ioctl.c

diff --git a/net/bridge/br_ioctl.c b/net/bridge/br_ioctl.c
index 60a3dbf..d99b200 100644 (file)
--- a/net/bridge/br_ioctl.c
+++ b/net/bridge/br_ioctl.c
@@ -113,7 +113,9 @@ static int add_del_if(struct net_bridge *br, int ifindex, int isadd)
 static int old_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 {
        struct net_bridge *br = netdev_priv(dev);
+       struct net_bridge_port *p = NULL;
        unsigned long args[4];
+       int ret = -EOPNOTSUPP;
 
        if (copy_from_user(args, rq->ifr_data, sizeof(args)))
                return -EFAULT;
@@ -183,25 +185,29 @@ static int old_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
                if (!ns_capable(dev_net(dev)->user_ns, CAP_NET_ADMIN))
                        return -EPERM;
 
-               return br_set_forward_delay(br, args[1]);
+               ret = br_set_forward_delay(br, args[1]);
+               break;
 
        case BRCTL_SET_BRIDGE_HELLO_TIME:
                if (!ns_capable(dev_net(dev)->user_ns, CAP_NET_ADMIN))
                        return -EPERM;
 
-               return br_set_hello_time(br, args[1]);
+               ret = br_set_hello_time(br, args[1]);
+               break;
 
        case BRCTL_SET_BRIDGE_MAX_AGE:
                if (!ns_capable(dev_net(dev)->user_ns, CAP_NET_ADMIN))
                        return -EPERM;
 
-               return br_set_max_age(br, args[1]);
+               ret = br_set_max_age(br, args[1]);
+               break;
 
        case BRCTL_SET_AGEING_TIME:
                if (!ns_capable(dev_net(dev)->user_ns, CAP_NET_ADMIN))
                        return -EPERM;
 
-               return br_set_ageing_time(br, args[1]);
+               ret = br_set_ageing_time(br, args[1]);
+               break;
 
        case BRCTL_GET_PORT_INFO:
        {
@@ -241,20 +247,19 @@ static int old_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
                        return -EPERM;
 
                br_stp_set_enabled(br, args[1]);
-               return 0;
+               ret = 0;
+               break;
 
        case BRCTL_SET_BRIDGE_PRIORITY:
                if (!ns_capable(dev_net(dev)->user_ns, CAP_NET_ADMIN))
                        return -EPERM;
 
                br_stp_set_bridge_priority(br, args[1]);
-               return 0;
+               ret = 0;
+               break;
 
        case BRCTL_SET_PORT_PRIORITY:
        {
-               struct net_bridge_port *p;
-               int ret;
-
                if (!ns_capable(dev_net(dev)->user_ns, CAP_NET_ADMIN))
                        return -EPERM;
 
@@ -264,14 +269,11 @@ static int old_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
                else
                        ret = br_stp_set_port_priority(p, args[2]);
                spin_unlock_bh(&br->lock);
-               return ret;
+               break;
        }
 
        case BRCTL_SET_PATH_COST:
        {
-               struct net_bridge_port *p;
-               int ret;
-
                if (!ns_capable(dev_net(dev)->user_ns, CAP_NET_ADMIN))
                        return -EPERM;
 
@@ -281,8 +283,7 @@ static int old_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
                else
                        ret = br_stp_set_path_cost(p, args[2]);
                spin_unlock_bh(&br->lock);
-
-               return ret;
+               break;
        }
 
        case BRCTL_GET_FDB_ENTRIES:
@@ -290,7 +291,14 @@ static int old_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
                                       args[2], args[3]);
        }
 
-       return -EOPNOTSUPP;
+       if (!ret) {
+               if (p)
+                       br_ifinfo_notify(RTM_NEWLINK, p);
+               else
+                       netdev_state_change(br->dev);
+       }
+
+       return ret;
 }
 
 static int old_deviceless(struct net *net, void __user *uarg)