diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-02 02:36:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-02 02:36:47 +0000 |
| commit | 8624512aa908741ba2795200133eae0d7f4557ea (patch) | |
| tree | d5d3036fccf2604f4c98dedc11e8adb929d6b52e /net/bridge/br_fdb.c | |
| parent | 7b8f5d6f1d45d9f9de1d26e7d3c32aa5af11b488 (diff) | |
Merge with 2.3.48.
Diffstat (limited to 'net/bridge/br_fdb.c')
| -rw-r--r-- | net/bridge/br_fdb.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c index 2ca3c7fdd..be9d1867a 100644 --- a/net/bridge/br_fdb.c +++ b/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 @@ int br_fdb_get_entries(struct net_bridge *br, 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 @@ int br_fdb_get_entries(struct net_bridge *br, 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++; |