leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bridge: allow ext learned entries to change ports

Browse Source 
current code silently ignores change of port in the request
message. This patch makes sure the port is modified and
notification is sent to userspace.

Fixes: cf6b8e1eed ("bridge: add API to notify bridge driver of learned FBD on offloaded device")
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Nikolay Aleksandrov 2017-07-03 15:14:59 -07:00 committed by David S. Miller
parent e05a90ec9e
commit 7597b266c5
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
net/bridge/br_fdb.c
View File

@ -1079,8 +1079,9 @@ void br_fdb_unsync_static(struct net_bridge *br, struct net_bridge_port *p)
int br_fdb_external_learn_add(struct net_bridge *br, struct net_bridge_port *p,
const unsigned char *addr, u16 vid)
{
struct hlist_head *head;
struct net_bridge_fdb_entry *fdb;
struct hlist_head *head;
bool modified = false;
int err = 0;
spin_lock_bh(&br->hash_lock);
@ -1095,14 +1096,25 @@ int br_fdb_external_learn_add(struct net_bridge *br, struct net_bridge_port *p,
}
fdb->added_by_external_learn = 1;
fdb_notify(br, fdb, RTM_NEWNEIGH);
} else if (fdb->added_by_external_learn) {
/* Refresh entry */
fdb->updated = fdb->used = jiffies;
} else if (!fdb->added_by_user) {
/* Take over SW learned entry */
fdb->added_by_external_learn = 1;
} else {
fdb->updated = jiffies;
fdb_notify(br, fdb, RTM_NEWNEIGH);
if (fdb->dst != p) {
fdb->dst = p;
modified = true;
}
if (fdb->added_by_external_learn) {
/* Refresh entry */
fdb->used = jiffies;
} else if (!fdb->added_by_user) {
/* Take over SW learned entry */
fdb->added_by_external_learn = 1;
modified = true;
}
if (modified)
fdb_notify(br, fdb, RTM_NEWNEIGH);
}
err_unlock: