openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

bridge: fdb: converge fdb_delete_by functions into one 

We can simplify the logic of entries pointing to the bridge by
converging the fdb_delete_by functions, this would allow us to use the
same function for both cases since the fdb's dst is set to NULL if it is
pointing to the bridge thus we can always check for a port match.

Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Nikolay Aleksandrov 2017-02-13 14:59:11 +01:00 committed by David S. Miller
parent 410b3d48f5
commit 5019ab50f2
1 changed files with 15 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
net/bridge/br_fdb.c
View File

@ -930,35 +930,10 @@ int br_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
return err; return err;
} }
static int fdb_delete_by_addr(struct net_bridge *br, const u8 *addr, static int fdb_delete_by_addr_and_port(struct net_bridge *br,
u16 vid) const struct net_bridge_port *p,
{
struct net_bridge_fdb_entry *fdb;
fdb = br_fdb_find(br, addr, vid);
if (!fdb)
return -ENOENT;
fdb_delete(br, fdb);
return 0;
}
static int __br_fdb_delete_by_addr(struct net_bridge *br,
const unsigned char *addr, u16 vid)
{
int err;
spin_lock_bh(&br->hash_lock);
err = fdb_delete_by_addr(br, addr, vid);
spin_unlock_bh(&br->hash_lock);
return err;
}
static int fdb_delete_by_addr_and_port(struct net_bridge_port *p,
const u8 *addr, u16 vlan) const u8 *addr, u16 vlan)
{ {
struct net_bridge *br = p->br;
struct net_bridge_fdb_entry *fdb; struct net_bridge_fdb_entry *fdb;
fdb = br_fdb_find(br, addr, vlan); fdb = br_fdb_find(br, addr, vlan);
@ -966,17 +941,19 @@ static int fdb_delete_by_addr_and_port(struct net_bridge_port *p,
return -ENOENT; return -ENOENT;
fdb_delete(br, fdb); fdb_delete(br, fdb);
return 0; return 0;
} }
static int __br_fdb_delete(struct net_bridge_port *p, static int __br_fdb_delete(struct net_bridge *br,
const struct net_bridge_port *p,
const unsigned char *addr, u16 vid) const unsigned char *addr, u16 vid)
{ {
int err; int err;
spin_lock_bh(&p->br->hash_lock); spin_lock_bh(&br->hash_lock);
err = fdb_delete_by_addr_and_port(p, addr, vid); err = fdb_delete_by_addr_and_port(br, p, addr, vid);
spin_unlock_bh(&p->br->hash_lock); spin_unlock_bh(&br->hash_lock);
return err; return err;
} }
@ -989,7 +966,7 @@ int br_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[],
struct net_bridge_vlan_group *vg; struct net_bridge_vlan_group *vg;
struct net_bridge_port *p = NULL; struct net_bridge_port *p = NULL;
struct net_bridge_vlan *v; struct net_bridge_vlan *v;
struct net_bridge *br = NULL; struct net_bridge *br;
int err; int err;
if (dev->priv_flags & IFF_EBRIDGE) { if (dev->priv_flags & IFF_EBRIDGE) {
@ -1003,6 +980,7 @@ int br_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[],
return -EINVAL; return -EINVAL;
} }
vg = nbp_vlan_group(p); vg = nbp_vlan_group(p);
br = p->br;
} }
if (vid) { if (vid) {
@ -1012,30 +990,20 @@ int br_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[],
return -EINVAL; return -EINVAL;
} }
if (dev->priv_flags & IFF_EBRIDGE) err = __br_fdb_delete(br, p, addr, vid);
err = __br_fdb_delete_by_addr(br, addr, vid);
else
err = __br_fdb_delete(p, addr, vid);
} else { } else {
err = -ENOENT; err = -ENOENT;
if (dev->priv_flags & IFF_EBRIDGE) err &= __br_fdb_delete(br, p, addr, 0);
err = __br_fdb_delete_by_addr(br, addr, 0);
else
err &= __br_fdb_delete(p, addr, 0);
if (!vg || !vg->num_vlans) if (!vg || !vg->num_vlans)
goto out; return err;
list_for_each_entry(v, &vg->vlan_list, vlist) { list_for_each_entry(v, &vg->vlan_list, vlist) {
if (!br_vlan_should_use(v)) if (!br_vlan_should_use(v))
continue; continue;
if (dev->priv_flags & IFF_EBRIDGE) err &= __br_fdb_delete(br, p, addr, v->vid);
err = __br_fdb_delete_by_addr(br, addr, v->vid);
else
err &= __br_fdb_delete(p, addr, v->vid);
} }
} }
out:
return err; return err;
} }