X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=bridge.c;h=a970d50cb3cfad13e09426eec76fddb6ca49cc51;hp=d29c3c0ccc49d061b71a9adb76711e0477e329ee;hb=0f0fa4f1c8cb4f793c3dddd1edd1420483e9e325;hpb=13f7f295f33c2639c390d4a6b2c58d1845e12fc3

diff --git a/bridge.c b/bridge.c
index d29c3c0..a970d50 100644
--- a/bridge.c
+++ b/bridge.c
@@ -26,6 +26,7 @@ enum {
 	BRIDGE_ATTR_IFNAME,
 	BRIDGE_ATTR_STP,
 	BRIDGE_ATTR_FORWARD_DELAY,
+	BRIDGE_ATTR_PRIORITY,
 	BRIDGE_ATTR_IGMP_SNOOP,
 	BRIDGE_ATTR_AGEING_TIME,
 	BRIDGE_ATTR_HELLO_TIME,
@@ -37,6 +38,7 @@ static const struct blobmsg_policy bridge_attrs[__BRIDGE_ATTR_MAX] = {
 	[BRIDGE_ATTR_IFNAME] = { "ifname", BLOBMSG_TYPE_ARRAY },
 	[BRIDGE_ATTR_STP] = { "stp", BLOBMSG_TYPE_BOOL },
 	[BRIDGE_ATTR_FORWARD_DELAY] = { "forward_delay", BLOBMSG_TYPE_INT32 },
+	[BRIDGE_ATTR_PRIORITY] = { "priority", BLOBMSG_TYPE_INT32 },
 	[BRIDGE_ATTR_AGEING_TIME] = { "ageing_time", BLOBMSG_TYPE_INT32 },
 	[BRIDGE_ATTR_HELLO_TIME] = { "hello_time", BLOBMSG_TYPE_INT32 },
 	[BRIDGE_ATTR_MAX_AGE] = { "max_age", BLOBMSG_TYPE_INT32 },
@@ -189,6 +191,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 +348,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);
 	}
 }
 
@@ -441,6 +464,7 @@ bridge_apply_settings(struct bridge_state *bst, struct blob_attr **tb)
 	cfg->stp = false;
 	cfg->forward_delay = 2;
 	cfg->igmp_snoop = true;
+	cfg->priority = 0x7FFF;
 
 	if ((cur = tb[BRIDGE_ATTR_STP]))
 		cfg->stp = blobmsg_get_bool(cur);
@@ -448,6 +472,9 @@ bridge_apply_settings(struct bridge_state *bst, struct blob_attr **tb)
 	if ((cur = tb[BRIDGE_ATTR_FORWARD_DELAY]))
 		cfg->forward_delay = blobmsg_get_u32(cur);
 
+	if ((cur = tb[BRIDGE_ATTR_PRIORITY]))
+		cfg->priority = blobmsg_get_u32(cur);
+
 	if ((cur = tb[BRIDGE_ATTR_IGMP_SNOOP]))
 		cfg->igmp_snoop = blobmsg_get_bool(cur);