Merge git://oss.sgi.com:8090/xfs/xfs-2.6

[linux-drm-fsl-dcu.git] / net / bridge / br_if.c

diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index f753c40c11d25743d6d13982443b7ebaa1020e38..f35c1a378d0fb6742273bf7d6b745b6f125224c2 100644 (file)
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -47,7 +47,7 @@ static int port_cost(struct net_device *dev)
        set_fs(KERNEL_DS);
        err = dev_ethtool(&ifr);
        set_fs(old_fs);
-       
+
        if (!err) {
                switch(ecmd.speed) {
                case SPEED_100:
@@ -77,12 +77,16 @@ static int port_cost(struct net_device *dev)
  * Called from work queue to allow for calling functions that
  * might sleep (such as speed check), and to debounce.
  */
-static void port_carrier_check(void *arg)
+static void port_carrier_check(struct work_struct *work)
 {
-       struct net_device *dev = arg;
        struct net_bridge_port *p;
+       struct net_device *dev;
        struct net_bridge *br;
 
+       dev = container_of(work, struct net_bridge_port,
+                          carrier_check.work)->dev;
+       work_release(work);
+
        rtnl_lock();
        p = dev->br_port;
        if (!p)
@@ -187,7 +191,7 @@ static void del_br(struct net_bridge *br)
        del_timer_sync(&br->gc_timer);
 
        br_sysfs_delbr(br->dev);
-       unregister_netdevice(br->dev);
+       unregister_netdevice(br->dev);
 }
 
 static struct net_device *new_bridge_dev(const char *name)
@@ -197,7 +201,7 @@ static struct net_device *new_bridge_dev(const char *name)
 
        dev = alloc_netdev(sizeof(struct net_bridge), name,
                           br_dev_setup);
-       
+
        if (!dev)
                return NULL;
 
@@ -254,12 +258,12 @@ static int find_portno(struct net_bridge *br)
 }
 
 /* called with RTNL but without bridge lock */
-static struct net_bridge_port *new_nbp(struct net_bridge *br, 
+static struct net_bridge_port *new_nbp(struct net_bridge *br,
                                       struct net_device *dev)
 {
        int index;
        struct net_bridge_port *p;
-       
+
        index = find_portno(br);
        if (index < 0)
                return ERR_PTR(index);
@@ -272,17 +276,17 @@ static struct net_bridge_port *new_nbp(struct net_bridge *br,
        dev_hold(dev);
        p->dev = dev;
        p->path_cost = port_cost(dev);
-       p->priority = 0x8000 >> BR_PORT_BITS;
+       p->priority = 0x8000 >> BR_PORT_BITS;
        p->port_no = index;
        br_init_port(p);
        p->state = BR_STATE_DISABLED;
-       INIT_WORK(&p->carrier_check, port_carrier_check, dev);
+       INIT_DELAYED_WORK_NAR(&p->carrier_check, port_carrier_check);
        br_stp_port_timer_init(p);
 
        kobject_init(&p->kobj);
        kobject_set_name(&p->kobj, SYSFS_BRIDGE_PORT_ATTR);
        p->kobj.ktype = &brport_ktype;
-       p->kobj.parent = &(dev->class_dev.kobj);
+       p->kobj.parent = &(dev->dev.kobj);
        p->kobj.kset = NULL;
 
        return p;
@@ -294,7 +298,7 @@ int br_add_bridge(const char *name)
        int ret;
 
        dev = new_bridge_dev(name);
-       if (!dev) 
+       if (!dev)
                return -ENOMEM;
 
        rtnl_lock();
@@ -325,7 +329,7 @@ int br_del_bridge(const char *name)
 
        rtnl_lock();
        dev = __dev_get_by_name(name);
-       if (dev == NULL) 
+       if (dev == NULL)
                ret =  -ENXIO;  /* Could not find device */
 
        else if (!(dev->priv_flags & IFF_EBRIDGE)) {
@@ -336,9 +340,9 @@ int br_del_bridge(const char *name)
        else if (dev->flags & IFF_UP) {
                /* Not shutdown yet. */
                ret = -EBUSY;
-       } 
+       }
 
-       else 
+       else
                del_br(netdev_priv(dev));
 
        rtnl_unlock();
@@ -424,7 +428,7 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
        if (err)
                goto err0;
 
-       err = br_fdb_insert(br, p, dev->dev_addr);
+       err = br_fdb_insert(br, p, dev->dev_addr);
        if (err)
                goto err1;
 
@@ -460,8 +464,8 @@ err0:
 int br_del_if(struct net_bridge *br, struct net_device *dev)
 {
        struct net_bridge_port *p = dev->br_port;
-       
-       if (!p || p->br != br) 
+
+       if (!p || p->br != br)
                return -EINVAL;
 
        del_nbp(p);