X-Git-Url: http://git.rot13.org/?p=bcm963xx.git;a=blobdiff_plain;f=kernel%2Flinux%2Fnet%2Fbridge%2Fbr_if.c;h=aa3d60000964031a5b8775ab0879d0616d6daa1a;hp=1a4ad2f063293ded39a172026dc1d523368c84fb;hb=57a096f051259ceaefd5977f30d269884e1dd248;hpb=a69849c98808437716b821267cd97529c56f45b0

diff --git a/kernel/linux/net/bridge/br_if.c b/kernel/linux/net/bridge/br_if.c
index 1a4ad2f0..aa3d6000 100755
--- a/kernel/linux/net/bridge/br_if.c
+++ b/kernel/linux/net/bridge/br_if.c
@@ -5,7 +5,7 @@
  *	Authors:
  *	Lennert Buytenhek		<buytenh@gnu.org>
  *
- *	$Id: br_if.c,v 1.1.1.1 2005/04/29 01:44:07 echo Exp $
+ *	$Id: br_if.c,v 1.7 2001/12/24 00:59:55 davem Exp $
  *
  *	This program is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU General Public License
@@ -24,6 +24,10 @@
 
 #include "br_private.h"
 
+#if defined(CONFIG_MIPS_BRCM)
+int snooping = 0;
+#endif
+
 /*
  * Determine initial path cost based on speed.
  * using recommendations from 802.1d standard
@@ -127,6 +131,8 @@ static void del_br(struct net_bridge *br)
 		del_nbp(p);
 	}
 
+	br_mc_fdb_cleanup(br);
+
 	del_timer_sync(&br->gc_timer);
 
 	br_sysfs_delbr(br->dev);
@@ -155,6 +161,11 @@ static struct net_device *new_bridge_dev(const char *name)
 	br->bridge_id.prio[1] = 0x00;
 	memset(br->bridge_id.addr, 0, ETH_ALEN);
 
+#if defined(CONFIG_MIPS_BRCM)
+	br->lock = SPIN_LOCK_UNLOCKED;
+	INIT_LIST_HEAD(&br->mc_list);
+	br->hash_lock = SPIN_LOCK_UNLOCKED;
+#endif
 	br->stp_enabled = 0;
 	br->designated_root = br->bridge_id;
 	br->root_path_cost = 0;