lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bridge: track last used time in forwarding table

Browse Source 
Adds tracking the last used time in forwarding table.
Rename ageing_timer to updated to better describe it.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
stephen hemminger
2011-04-04 14:03:28 +00:00
committed by David S. Miller
parent 03e9b64b89
commit 7cd8861ab0
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
net/bridge/br_fdb.c
View File

@@ -62,7 +62,7 @@ static inline int has_expired(const struct net_bridge *br,
const struct net_bridge_fdb_entry *fdb) const struct net_bridge_fdb_entry *fdb)
{ {
return !fdb->is_static && return !fdb->is_static &&
time_before_eq(fdb->ageing_timer + hold_time(br), jiffies); time_before_eq(fdb->updated + hold_time(br), jiffies);
} }
static inline int br_mac_hash(const unsigned char *mac) static inline int br_mac_hash(const unsigned char *mac)
@@ -140,7 +140,7 @@ void br_fdb_cleanup(unsigned long _data)
unsigned long this_timer; unsigned long this_timer;
if (f->is_static) if (f->is_static)
continue; continue;
this_timer = f->ageing_timer + delay; this_timer = f->updated + delay;
if (time_before_eq(this_timer, jiffies)) if (time_before_eq(this_timer, jiffies))
fdb_delete(f); fdb_delete(f);
else if (time_before(this_timer, next_timer)) else if (time_before(this_timer, next_timer))
@@ -293,7 +293,7 @@ int br_fdb_fillbuf(struct net_bridge *br, void *buf,
fe->is_local = f->is_local; fe->is_local = f->is_local;
if (!f->is_static) if (!f->is_static)
fe->ageing_timer_value = jiffies_to_clock_t(jiffies - f->ageing_timer); fe->ageing_timer_value = jiffies_to_clock_t(jiffies - f->updated);
++fe; ++fe;
++num; ++num;
} }
@@ -330,7 +330,7 @@ static struct net_bridge_fdb_entry *fdb_create(struct hlist_head *head,
fdb->dst = source; fdb->dst = source;
fdb->is_local = 0; fdb->is_local = 0;
fdb->is_static = 0; fdb->is_static = 0;
fdb->ageing_timer = jiffies; fdb->updated = fdb->used = jiffies;
hlist_add_head_rcu(&fdb->hlist, head); hlist_add_head_rcu(&fdb->hlist, head);
} }
return fdb; return fdb;
@@ -404,7 +404,7 @@ void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source,
} else { } else {
/* fastpath: update of existing entry */ /* fastpath: update of existing entry */
fdb->dst = source; fdb->dst = source;
fdb->ageing_timer = jiffies; fdb->updated = jiffies;
} }
} else { } else {
spin_lock(&br->hash_lock); spin_lock(&br->hash_lock);

5
net/bridge/br_input.c
View File

@@ -98,9 +98,10 @@ int br_handle_frame_finish(struct sk_buff *skb)
} }
if (skb) { if (skb) {
if (dst) if (dst) {
dst->used = jiffies;
br_forward(dst->dst, skb, skb2); br_forward(dst->dst, skb, skb2);
else } else
br_flood_forward(br, skb, skb2); br_flood_forward(br, skb, skb2);
} }

3
net/bridge/br_private.h
View File

@@ -64,7 +64,8 @@ struct net_bridge_fdb_entry
struct net_bridge_port *dst; struct net_bridge_port *dst;
struct rcu_head rcu; struct rcu_head rcu;
unsigned long ageing_timer; unsigned long updated;
unsigned long used;
mac_addr addr; mac_addr addr;
unsigned char is_local; unsigned char is_local;
unsigned char is_static; unsigned char is_static;