Commit 47a69521 authored by Andrew Morton's avatar Andrew Morton Committed by David S. Miller

[BRIDGE]: Build fix for gcc-2.95.x

gcc-2.95.c does not support anonymous unions.
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarDavid S. Miller <davem@redhat.com>
parent 8813c6b1
...@@ -75,7 +75,7 @@ static __inline__ void fdb_delete(struct net_bridge_fdb_entry *f) ...@@ -75,7 +75,7 @@ static __inline__ void fdb_delete(struct net_bridge_fdb_entry *f)
{ {
hlist_del_rcu(&f->hlist); hlist_del_rcu(&f->hlist);
if (!f->is_static) if (!f->is_static)
list_del(&f->age_list); list_del(&f->u.age_list);
br_fdb_put(f); br_fdb_put(f);
} }
...@@ -130,9 +130,11 @@ void br_fdb_cleanup(unsigned long _data) ...@@ -130,9 +130,11 @@ void br_fdb_cleanup(unsigned long _data)
delay = hold_time(br); delay = hold_time(br);
list_for_each_safe(l, n, &br->age_list) { list_for_each_safe(l, n, &br->age_list) {
struct net_bridge_fdb_entry *f struct net_bridge_fdb_entry *f;
= list_entry(l, struct net_bridge_fdb_entry, age_list); unsigned long expires;
unsigned long expires = f->ageing_timer + delay;
f = list_entry(l, struct net_bridge_fdb_entry, u.age_list);
expires = f->ageing_timer + delay;
if (time_before_eq(expires, jiffies)) { if (time_before_eq(expires, jiffies)) {
WARN_ON(f->is_static); WARN_ON(f->is_static);
...@@ -220,7 +222,7 @@ struct net_bridge_fdb_entry *br_fdb_get(struct net_bridge *br, ...@@ -220,7 +222,7 @@ struct net_bridge_fdb_entry *br_fdb_get(struct net_bridge *br,
static void fdb_rcu_free(struct rcu_head *head) static void fdb_rcu_free(struct rcu_head *head)
{ {
struct net_bridge_fdb_entry *ent struct net_bridge_fdb_entry *ent
= container_of(head, struct net_bridge_fdb_entry, rcu); = container_of(head, struct net_bridge_fdb_entry, u.rcu);
kmem_cache_free(br_fdb_cache, ent); kmem_cache_free(br_fdb_cache, ent);
} }
...@@ -228,7 +230,7 @@ static void fdb_rcu_free(struct rcu_head *head) ...@@ -228,7 +230,7 @@ static void fdb_rcu_free(struct rcu_head *head)
void br_fdb_put(struct net_bridge_fdb_entry *ent) void br_fdb_put(struct net_bridge_fdb_entry *ent)
{ {
if (atomic_dec_and_test(&ent->use_count)) if (atomic_dec_and_test(&ent->use_count))
call_rcu(&ent->rcu, fdb_rcu_free); call_rcu(&ent->u.rcu, fdb_rcu_free);
} }
/* /*
...@@ -314,7 +316,7 @@ static int fdb_insert(struct net_bridge *br, struct net_bridge_port *source, ...@@ -314,7 +316,7 @@ static int fdb_insert(struct net_bridge *br, struct net_bridge_port *source,
return 0; return 0;
/* move to end of age list */ /* move to end of age list */
list_del(&fdb->age_list); list_del(&fdb->u.age_list);
goto update; goto update;
} }
} }
...@@ -338,7 +340,7 @@ static int fdb_insert(struct net_bridge *br, struct net_bridge_port *source, ...@@ -338,7 +340,7 @@ static int fdb_insert(struct net_bridge *br, struct net_bridge_port *source,
fdb->is_static = is_local; fdb->is_static = is_local;
fdb->ageing_timer = jiffies; fdb->ageing_timer = jiffies;
if (!is_local) if (!is_local)
list_add_tail(&fdb->age_list, &br->age_list); list_add_tail(&fdb->u.age_list, &br->age_list);
return 0; return 0;
} }
......
...@@ -49,7 +49,7 @@ struct net_bridge_fdb_entry ...@@ -49,7 +49,7 @@ struct net_bridge_fdb_entry
union { union {
struct list_head age_list; struct list_head age_list;
struct rcu_head rcu; struct rcu_head rcu;
}; } u;
atomic_t use_count; atomic_t use_count;
unsigned long ageing_timer; unsigned long ageing_timer;
mac_addr addr; mac_addr addr;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment