Merge branch 'for-linus2' of git://git.kernel.dk/linux-2.6-block

[safe/jmp/linux-2.6] / net / bridge / br_if.c

diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index 66c4f71..18b245e 100644 (file)
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -13,12 +13,14 @@
 
 #include <linux/kernel.h>
 #include <linux/netdevice.h>
+#include <linux/netpoll.h>
 #include <linux/ethtool.h>
 #include <linux/if_arp.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/rtnetlink.h>
 #include <linux/if_ether.h>
+#include <linux/slab.h>
 #include <net/sock.h>
 
 #include "br_private.h"
@@ -131,7 +133,7 @@ static void del_nbp(struct net_bridge_port *p)
        struct net_bridge *br = p->br;
        struct net_device *dev = p->dev;
 
-       sysfs_remove_link(br->ifobj, dev->name);
+       sysfs_remove_link(br->ifobj, p->dev->name);
 
        dev_set_promiscuity(dev, -1);
 
@@ -147,14 +149,17 @@ static void del_nbp(struct net_bridge_port *p)
 
        rcu_assign_pointer(dev->br_port, NULL);
 
+       br_multicast_del_port(p);
+
        kobject_uevent(&p->kobj, KOBJ_REMOVE);
        kobject_del(&p->kobj);
 
+       br_netpoll_disable(br, dev);
        call_rcu(&p->rcu, destroy_nbp_rcu);
 }
 
 /* called with RTNL */
-static void del_br(struct net_bridge *br)
+static void del_br(struct net_bridge *br, struct list_head *head)
 {
        struct net_bridge_port *p, *n;
 
@@ -162,10 +167,12 @@ static void del_br(struct net_bridge *br)
                del_nbp(p);
        }
 
+       br_netpoll_cleanup(br->dev);
+
        del_timer_sync(&br->gc_timer);
 
        br_sysfs_delbr(br->dev);
-       unregister_netdevice(br->dev);
+       unregister_netdevice_queue(br->dev, head);
 }
 
 static struct net_device *new_bridge_dev(struct net *net, const char *name)
@@ -183,6 +190,12 @@ static struct net_device *new_bridge_dev(struct net *net, const char *name)
        br = netdev_priv(dev);
        br->dev = dev;
 
+       br->stats = alloc_percpu(struct br_cpu_netstats);
+       if (!br->stats) {
+               free_netdev(dev);
+               return NULL;
+       }
+
        spin_lock_init(&br->lock);
        INIT_LIST_HEAD(&br->port_list);
        spin_lock_init(&br->hash_lock);
@@ -206,9 +219,8 @@ static struct net_device *new_bridge_dev(struct net *net, const char *name)
 
        br_netfilter_rtable_init(br);
 
-       INIT_LIST_HEAD(&br->age_list);
-
        br_stp_timer_init(br);
+       br_multicast_init(br);
 
        return dev;
 }
@@ -256,13 +268,19 @@ static struct net_bridge_port *new_nbp(struct net_bridge *br,
        p->path_cost = port_cost(dev);
        p->priority = 0x8000 >> BR_PORT_BITS;
        p->port_no = index;
+       p->flags = 0;
        br_init_port(p);
        p->state = BR_STATE_DISABLED;
        br_stp_port_timer_init(p);
+       br_multicast_add_port(p);
 
        return p;
 }
 
+static struct device_type br_type = {
+       .name   = "bridge",
+};
+
 int br_add_bridge(struct net *net, const char *name)
 {
        struct net_device *dev;
@@ -279,6 +297,8 @@ int br_add_bridge(struct net *net, const char *name)
                        goto out_free;
        }
 
+       SET_NETDEV_DEVTYPE(dev, &br_type);
+
        ret = register_netdevice(dev);
        if (ret)
                goto out_free;
@@ -316,7 +336,7 @@ int br_del_bridge(struct net *net, const char *name)
        }
 
        else
-               del_br(netdev_priv(dev));
+               del_br(netdev_priv(dev), NULL);
 
        rtnl_unlock();
        return ret;
@@ -347,15 +367,21 @@ int br_min_mtu(const struct net_bridge *br)
 void br_features_recompute(struct net_bridge *br)
 {
        struct net_bridge_port *p;
-       unsigned long features;
+       unsigned long features, mask;
 
-       features = br->feature_mask;
+       features = mask = br->feature_mask;
+       if (list_empty(&br->port_list))
+               goto done;
+
+       features &= ~NETIF_F_ONE_FOR_ALL;
 
        list_for_each_entry(p, &br->port_list, list) {
-               features = netdev_compute_features(features, p->dev->features);
+               features = netdev_increment_features(features,
+                                                    p->dev->features, mask);
        }
 
-       br->dev->features = features;
+done:
+       br->dev->features = netdev_fix_features(features, NULL);
 }
 
 /* called with RTNL */
@@ -364,15 +390,23 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
        struct net_bridge_port *p;
        int err = 0;
 
-       if (dev->flags & IFF_LOOPBACK || dev->type != ARPHRD_ETHER)
+       /* Don't allow bridging non-ethernet like devices */
+       if ((dev->flags & IFF_LOOPBACK) ||
+           dev->type != ARPHRD_ETHER || dev->addr_len != ETH_ALEN)
                return -EINVAL;
 
-       if (dev->hard_start_xmit == br_dev_xmit)
+       /* No bridging of bridges */
+       if (dev->netdev_ops->ndo_start_xmit == br_dev_xmit)
                return -ELOOP;
 
+       /* Device is already being bridged */
        if (dev->br_port != NULL)
                return -EBUSY;
 
+       /* No bridging devices that dislike that (e.g. wireless) */
+       if (dev->priv_flags & IFF_DONT_BRIDGE)
+               return -EOPNOTSUPP;
+
        p = new_nbp(br, dev);
        if (IS_ERR(p))
                return PTR_ERR(p);
@@ -414,13 +448,15 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
 
        kobject_uevent(&p->kobj, KOBJ_ADD);
 
+       br_netpoll_enable(br, dev);
+
        return 0;
 err2:
        br_fdb_delete_by_port(br, p, 1);
 err1:
-       kobject_del(&p->kobj);
-err0:
        kobject_put(&p->kobj);
+       p = NULL; /* kobject_put frees */
+err0:
        dev_set_promiscuity(dev, -1);
 put_back:
        dev_put(dev);
@@ -446,18 +482,17 @@ int br_del_if(struct net_bridge *br, struct net_device *dev)
        return 0;
 }
 
-void __exit br_cleanup_bridges(void)
+void __net_exit br_net_exit(struct net *net)
 {
        struct net_device *dev;
+       LIST_HEAD(list);
 
        rtnl_lock();
-restart:
-       for_each_netdev(&init_net, dev) {
-               if (dev->priv_flags & IFF_EBRIDGE) {
-                       del_br(dev->priv);
-                       goto restart;
-               }
-       }
+       for_each_netdev(net, dev)
+               if (dev->priv_flags & IFF_EBRIDGE)
+                       del_br(netdev_priv(dev), &list);
+
+       unregister_netdevice_many(&list);
        rtnl_unlock();
 
 }