X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=bridge.c;h=1d02f8375753c156c22c6875059146f7d3420749;hp=d29c3c0ccc49d061b71a9adb76711e0477e329ee;hb=68bb041b6ce4cde28186557262bee7b766c77b2d;hpb=13f7f295f33c2639c390d4a6b2c58d1845e12fc3

diff --git a/bridge.c b/bridge.c
index d29c3c0..1d02f83 100644
--- a/bridge.c
+++ b/bridge.c
@@ -189,6 +189,29 @@ bridge_remove_member(struct bridge_member *bm)
 }
 
 static void
+bridge_free_member(struct bridge_member *bm)
+{
+	struct device *dev = bm->dev.dev;
+
+	bridge_remove_member(bm);
+	device_remove_user(&bm->dev);
+
+	/*
+	 * When reloading the config and moving a device from one bridge to
+	 * another, the other bridge may have tried to claim this device
+	 * before it was removed here.
+	 * Ensure that claiming the device is retried by toggling its present
+	 * state
+	 */
+	if (dev->present) {
+		device_set_present(dev, false);
+		device_set_present(dev, true);
+	}
+
+	free(bm);
+}
+
+static void
 bridge_member_cb(struct device_user *dev, enum device_event ev)
 {
 	struct bridge_member *bm = container_of(dev, struct bridge_member, dev);
@@ -323,9 +346,7 @@ bridge_member_update(struct vlist_tree *tree, struct vlist_node *node_new,
 
 	if (node_old) {
 		bm = container_of(node_old, struct bridge_member, node);
-		bridge_remove_member(bm);
-		device_remove_user(&bm->dev);
-		free(bm);
+		bridge_free_member(bm);
 	}
 }