From: Felix Fietkau <nbd@nbd.name>
Date: Tue, 22 Jun 2021 14:56:39 +0000 (+0200)
Subject: bridge: fix enabling hotplug-added VLANs on the bridge port
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=db0fa24e1c17dbeadc119ba9fc93805fa962eed7;p=project%2Fnetifd.git

bridge: fix enabling hotplug-added VLANs on the bridge port

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---

diff --git a/bridge.c b/bridge.c
index f3e2fed..925cfe4 100644
--- a/bridge.c
+++ b/bridge.c
@@ -704,6 +704,11 @@ bridge_hotplug_get_vlan(struct bridge_state *bst, unsigned int vid)
 	INIT_LIST_HEAD(&vlan->hotplug_ports);
 	vlist_add(&bst->dev.vlans, &vlan->node, &vlan->vid);
 	vlan->node.version = -1;
+	if (!vlan->pending)
+		return vlan;
+
+	vlan->pending = false;
+	bridge_set_vlan_state(bst, vlan, true);
 
 	return vlan;
 }