This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / net / bridge / br_private.h

diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index d2b2fb2..1064d4c 100644 (file)
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -46,10 +46,7 @@ struct net_bridge_fdb_entry
 {
        struct hlist_node               hlist;
        struct net_bridge_port          *dst;
-       union {
-               struct list_head        age_list;
-               struct rcu_head         rcu;
-       } u;
+       struct list_head                age_list;
        atomic_t                        use_count;
        unsigned long                   ageing_timer;
        mac_addr                        addr;
@@ -89,7 +86,7 @@ struct net_bridge
        struct list_head                port_list;
        struct net_device               *dev;
        struct net_device_stats         statistics;
-       spinlock_t                      hash_lock;
+       rwlock_t                        hash_lock;
        struct hlist_head               hash[BR_HASH_SIZE];
        struct list_head                age_list;
 
@@ -139,10 +136,8 @@ extern void br_fdb_changeaddr(struct net_bridge_port *p,
 extern void br_fdb_cleanup(unsigned long arg);
 extern void br_fdb_delete_by_port(struct net_bridge *br,
                           struct net_bridge_port *p);
-extern struct net_bridge_fdb_entry *__br_fdb_get(struct net_bridge *br,
-                                                const unsigned char *addr);
 extern struct net_bridge_fdb_entry *br_fdb_get(struct net_bridge *br,
-                                              unsigned char *addr);
+                                       unsigned char *addr);
 extern void br_fdb_put(struct net_bridge_fdb_entry *ent);
 extern int br_fdb_fillbuf(struct net_bridge *br, void *buf, 
                          unsigned long count, unsigned long off);