GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-21 14:11:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

bridge: change arguments to fdb_create

Browse source 
Later patch provides ability to create non-local static entry.
To make this easier move the updating of the flag values to
after the code that creates entry.

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:27 +00:00 • committed by David S. Miller
parent 0545a30377
commit 03e9b64b89
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
net/bridge/br_fdb.c
View file

@ -320,8 +320,7 @@ static inline struct net_bridge_fdb_entry *fdb_find(struct hlist_head *head,
static struct net_bridge_fdb_entry *fdb_create(struct hlist_head *head, static struct net_bridge_fdb_entry *fdb_create(struct hlist_head *head,
struct net_bridge_port *source, struct net_bridge_port *source,
const unsigned char *addr, const unsigned char *addr)
int is_local)
{ {
struct net_bridge_fdb_entry *fdb; struct net_bridge_fdb_entry *fdb;
@ -329,10 +328,9 @@ static struct net_bridge_fdb_entry *fdb_create(struct hlist_head *head,
if (fdb) { if (fdb) {
memcpy(fdb->addr.addr, addr, ETH_ALEN); memcpy(fdb->addr.addr, addr, ETH_ALEN);
fdb->dst = source; fdb->dst = source;
fdb->is_local = is_local; fdb->is_local = 0;
fdb->is_static = is_local; fdb->is_static = 0;
fdb->ageing_timer = jiffies; fdb->ageing_timer = jiffies;
hlist_add_head_rcu(&fdb->hlist, head); hlist_add_head_rcu(&fdb->hlist, head);
} }
return fdb; return fdb;
@ -360,12 +358,15 @@ static int fdb_insert(struct net_bridge *br, struct net_bridge_port *source,
fdb_delete(fdb); fdb_delete(fdb);
} }
if (!fdb_create(head, source, addr, 1)) fdb = fdb_create(head, source, addr);
if (!fdb)
return -ENOMEM; return -ENOMEM;
fdb->is_local = fdb->is_static = 1;
return 0; return 0;
} }
/* Add entry for local address of interface */
int br_fdb_insert(struct net_bridge *br, struct net_bridge_port *source, int br_fdb_insert(struct net_bridge *br, struct net_bridge_port *source,
const unsigned char *addr) const unsigned char *addr)
{ {
@ -407,8 +408,9 @@ void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source,
} }
} else { } else {
spin_lock(&br->hash_lock); spin_lock(&br->hash_lock);
if (!fdb_find(head, addr)) if (likely(!fdb_find(head, addr)))
fdb_create(head, source, addr, 0); fdb_create(head, source, addr);
/* else we lose race and someone else inserts /* else we lose race and someone else inserts
* it first, don't bother updating * it first, don't bother updating
*/ */