X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=kernel%2Fnet%2Fbridge%2Fbr_fdb.c;fp=kernel%2Fnet%2Fbridge%2Fbr_fdb.c;h=09442e0f7f67f21e3fd33c158ecd1d8f273b3565;hb=52f993b8e89487ec9ee15a7fb4979e0f09a45b27;hp=a642bb829d09cfd473d5ad17a64b2ba6b76d912e;hpb=c189ccac5702322ed843fe17057035b7222a59b6;p=kvmfornfv.git

diff --git a/kernel/net/bridge/br_fdb.c b/kernel/net/bridge/br_fdb.c
index a642bb829..09442e0f7 100644
--- a/kernel/net/bridge/br_fdb.c
+++ b/kernel/net/bridge/br_fdb.c
@@ -278,6 +278,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);