hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bridge: refactor fdb_notify 

Move fdb_notify outside of fdb_create. This fixes the problem
that notification of local entries are not flagged correctly.

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-12-06 13:02:24 +00:00 committed by David S. Miller
parent f33f1fccbf
commit f58ee4e1a2
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
net/bridge/br_fdb.c
View File

@ -347,7 +347,6 @@ static struct net_bridge_fdb_entry *fdb_create(struct hlist_head *head,
fdb->is_static = 0; fdb->is_static = 0;
fdb->updated = fdb->used = jiffies; fdb->updated = fdb->used = jiffies;
hlist_add_head_rcu(&fdb->hlist, head); hlist_add_head_rcu(&fdb->hlist, head);
fdb_notify(fdb, RTM_NEWNEIGH);
} }
return fdb; return fdb;
} }
@ -379,6 +378,7 @@ static int fdb_insert(struct net_bridge *br, struct net_bridge_port *source,
return -ENOMEM; return -ENOMEM;
fdb->is_local = fdb->is_static = 1; fdb->is_local = fdb->is_static = 1;
fdb_notify(fdb, RTM_NEWNEIGH);
return 0; return 0;
} }
@ -424,9 +424,11 @@ 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 (likely(!fdb_find(head, addr))) if (likely(!fdb_find(head, addr))) {
fdb_create(head, source, addr); fdb = fdb_create(head, source, addr);
if (fdb)
fdb_notify(fdb, RTM_NEWNEIGH);
}
/* 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
*/ */
@ -572,6 +574,7 @@ static int fdb_add_entry(struct net_bridge_port *source, const __u8 *addr,
fdb = fdb_create(head, source, addr); fdb = fdb_create(head, source, addr);
if (!fdb) if (!fdb)
return -ENOMEM; return -ENOMEM;
fdb_notify(fdb, RTM_NEWNEIGH);
} else { } else {
if (flags & NLM_F_EXCL) if (flags & NLM_F_EXCL)
return -EEXIST; return -EEXIST;