summaryrefslogtreecommitdiff
path: root/bridge.c
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2021-06-22 16:56:39 +0200
committerFelix Fietkau <nbd@nbd.name>2021-06-22 16:56:44 +0200
commitdb0fa24e1c17dbeadc119ba9fc93805fa962eed7 (patch)
treef23820c85bc656c596c5c9a2ca47f3d2319ec957 /bridge.c
parentf037b082923abc2dad0d14c8401ebe0afd816b5c (diff)
downloadnetifd-db0fa24e1c17dbeadc119ba9fc93805fa962eed7.tar.gz
bridge: fix enabling hotplug-added VLANs on the bridge port
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'bridge.c')
-rw-r--r--bridge.c5
1 files changed, 5 insertions, 0 deletions
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;
}