diff options
| author | Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp> | 2016-06-07 19:14:17 +0900 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-06-08 00:31:38 -0700 |
| commit | 0b148def403153a4d1565f1640356cb78ce5109f (patch) | |
| tree | 08d07a97b4ed9b4e0461ce0fcf1090aa38c72165 /net/bridge/br_fdb.c | |
| parent | 32565644580de57e67b700f7ddbf658e0fc43a35 (diff) | |
| download | linux-rpi-0b148def403153a4d1565f1640356cb78ce5109f.tar.gz linux-rpi-0b148def403153a4d1565f1640356cb78ce5109f.tar.bz2 linux-rpi-0b148def403153a4d1565f1640356cb78ce5109f.zip | |
bridge: Don't insert unnecessary local fdb entry on changing mac address
The missing br_vlan_should_use() test caused creation of an unneeded
local fdb entry on changing mac address of a bridge device when there is
a vlan which is configured on a bridge port but not on the bridge
device.
Fixes: 2594e9064a57 ("bridge: vlan: add per-vlan struct and move to rhashtables")
Signed-off-by: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
Acked-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_fdb.c')
| -rw-r--r-- | net/bridge/br_fdb.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c index dcea4f4c62b3..c18080ad4085 100644 --- a/net/bridge/br_fdb.c +++ b/net/bridge/br_fdb.c @@ -279,6 +279,8 @@ void br_fdb_change_mac_address(struct net_bridge *br, const u8 *newaddr) * change from under us. */ list_for_each_entry(v, &vg->vlan_list, vlist) { + if (!br_vlan_should_use(v)) + continue; f = __br_fdb_get(br, br->dev->dev_addr, v->vid); if (f && f->is_local && !f->dst) fdb_delete_local(br, NULL, f); |