X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=bridge.c;h=01c9a2c2c0bb1cd49d9c40dc0af4d7c00b433bcb;hp=9aa26f232c6205620ccd03eaf10fcbc0ed4c0387;hb=b08f841685bf67b3f4f8cc3e8f667c80878916a8;hpb=d095bf24cf7879150d008c23998676bfedebbde6

diff --git a/bridge.c b/bridge.c
index 9aa26f2..01c9a2c 100644
--- a/bridge.c
+++ b/bridge.c
@@ -31,6 +31,7 @@ enum {
 	BRIDGE_ATTR_AGEING_TIME,
 	BRIDGE_ATTR_HELLO_TIME,
 	BRIDGE_ATTR_MAX_AGE,
+	BRIDGE_ATTR_BRIDGE_EMPTY,
 	__BRIDGE_ATTR_MAX
 };
 
@@ -43,6 +44,7 @@ static const struct blobmsg_policy bridge_attrs[__BRIDGE_ATTR_MAX] = {
 	[BRIDGE_ATTR_HELLO_TIME] = { "hello_time", BLOBMSG_TYPE_INT32 },
 	[BRIDGE_ATTR_MAX_AGE] = { "max_age", BLOBMSG_TYPE_INT32 },
 	[BRIDGE_ATTR_IGMP_SNOOP] = { "igmp_snooping", BLOBMSG_TYPE_BOOL },
+	[BRIDGE_ATTR_BRIDGE_EMPTY] = { "bridge_empty", BLOBMSG_TYPE_BOOL },
 };
 
 static const struct uci_blob_param_info bridge_attr_info[__BRIDGE_ATTR_MAX] = {
@@ -185,6 +187,9 @@ bridge_remove_member(struct bridge_member *bm)
 	bm->present = false;
 	bm->bst->n_present--;
 
+	if (bst->config.bridge_empty)
+		return;
+
 	bst->force_active = false;
 	if (bst->n_present == 0)
 		device_set_present(&bst->dev, false);
@@ -444,12 +449,16 @@ bridge_config_init(struct device *dev)
 
 	bst = container_of(dev, struct bridge_state, dev);
 
-	if (!bst->ifnames)
-		return;
+	if (bst->config.bridge_empty) {
+		bst->force_active = true;
+		device_set_present(&bst->dev, true);
+	}
 
 	vlist_update(&bst->members);
-	blobmsg_for_each_attr(cur, bst->ifnames, rem) {
-		bridge_add_member(bst, blobmsg_data(cur));
+	if (bst->ifnames) {
+		blobmsg_for_each_attr(cur, bst->ifnames, rem) {
+			bridge_add_member(bst, blobmsg_data(cur));
+		}
 	}
 	vlist_flush(&bst->members);
 }
@@ -464,6 +473,7 @@ bridge_apply_settings(struct bridge_state *bst, struct blob_attr **tb)
 	cfg->stp = false;
 	cfg->forward_delay = 2;
 	cfg->igmp_snoop = false;
+	cfg->bridge_empty = false;
 	cfg->priority = 0x7FFF;
 
 	if ((cur = tb[BRIDGE_ATTR_STP]))
@@ -492,6 +502,9 @@ bridge_apply_settings(struct bridge_state *bst, struct blob_attr **tb)
 		cfg->max_age = blobmsg_get_u32(cur);
 		cfg->flags |= BRIDGE_OPT_MAX_AGE;
 	}
+
+	if ((cur = tb[BRIDGE_ATTR_BRIDGE_EMPTY]))
+		cfg->bridge_empty = blobmsg_get_bool(cur);
 }
 
 enum dev_change_type