bridge br_multicast: Make functions less ipv4 dependent.

[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 a6f74b2..5214393 100644 (file)
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -19,6 +19,7 @@
 #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"
@@ -147,6 +148,8 @@ 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);
 
@@ -183,6 +186,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 +215,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;
 }
@@ -260,6 +268,7 @@ static struct net_bridge_port *new_nbp(struct net_bridge *br,
        br_init_port(p);
        p->state = BR_STATE_DISABLED;
        br_stp_port_timer_init(p);
+       br_multicast_add_port(p);
 
        return p;
 }
@@ -390,6 +399,10 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
        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);
@@ -463,7 +476,7 @@ int br_del_if(struct net_bridge *br, struct net_device *dev)
        return 0;
 }
 
-void br_net_exit(struct net *net)
+void __net_exit br_net_exit(struct net *net)
 {
        struct net_device *dev;
        LIST_HEAD(list);