patch-2.3.48 linux/net/bridge/br_fdb.c

• Lines: 44
• Date: Thu Feb 24 10:30:25 2000
• Orig file: v2.3.47/linux/net/bridge/br_fdb.c
• Orig date: Sun Feb 20 21:12:40 2000

diff -u --recursive --new-file v2.3.47/linux/net/bridge/br_fdb.c linux/net/bridge/br_fdb.c
@@ -5,7 +5,7 @@
  *	Authors:
  *	Lennert Buytenhek		<buytenh@gnu.org>
  *
- *	$Id: br_fdb.c,v 1.1 2000/02/18 16:47:12 davem Exp $
+ *	$Id: br_fdb.c,v 1.4 2000/02/24 06:16:45 davem Exp $
  *
  *	This program is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU General Public License
@@ -14,9 +14,9 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/spinlock.h>
 #include <linux/if_bridge.h>
 #include <asm/atomic.h>
-#include <asm/spinlock.h>
 #include <asm/uaccess.h>
 #include "br_private.h"
 
@@ -216,6 +216,7 @@
 			struct __fdb_entry ent;
 			int err;
 			struct net_bridge_fdb_entry *g;
+			struct net_bridge_fdb_entry **pp; 
 
 			if (has_expired(br, f)) {
 				f = f->next_hash;
@@ -236,13 +237,13 @@
 			read_lock_bh(&br->hash_lock);
 
 			g = f->next_hash;
+			pp = f->pprev_hash;
 			br_fdb_put(f);
 
 			if (err)
 				goto out_fault;
 
-			if (f->next_hash == NULL &&
-			    f->pprev_hash == NULL)
+			if (g == NULL && pp == NULL)
 				goto out_disappeared;
 
 			num++;