X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/65c8d28d39e590c291f7f40360a9ff2f930925de..3c4461a2c9e1a31227ec6a9a7e48e63f437ab182:/package/swconfig/src/uci.c

diff --git a/package/swconfig/src/uci.c b/package/swconfig/src/uci.c
index e597acebf..1de689ce6 100644
--- a/package/swconfig/src/uci.c
+++ b/package/swconfig/src/uci.c
@@ -46,13 +46,19 @@ struct swlib_setting {
 };
 
 struct swlib_setting early_settings[] = {
-	{ .name = "reset" },
-	{ .name = "enable_vlan" },
+	{ .name = "reset", .val = "1" },
+	{ .name = "enable_vlan", .val = "1" },
 };
 
 static struct swlib_setting *settings;
 static struct swlib_setting **head;
 
+static bool swlib_match_name(struct switch_dev *dev, const char *name)
+{
+	return (strcmp(name, dev->dev_name) == 0 ||
+		strcmp(name, dev->alias) == 0);
+}
+
 static int
 swlib_map_settings(struct switch_dev *dev, int type, int port_vlan, struct uci_section *s)
 {
@@ -131,13 +137,13 @@ int swlib_apply_from_uci(struct switch_dev *dev, struct uci_package *p)
 			if (o->type != UCI_TYPE_STRING)
 				continue;
 
-			if (!strcmp(o->v.string, dev->dev_name))
+			if (swlib_match_name(dev, o->v.string))
 				goto found;
 
 			break;
 		}
 
-		if (strcmp(e->name, dev->dev_name) != 0)
+		if (!swlib_match_name(dev, e->name))
 			continue;
 
 		goto found;
@@ -171,7 +177,7 @@ found:
 
 				if (!strcmp(os->name, "device")) {
 					devn = o->v.string;
-					if (strcmp(devn, dev->dev_name) != 0)
+					if (!swlib_match_name(dev, devn))
 						devn = NULL;
 				} else if (!strcmp(os->name, "port")) {
 					port = o->v.string;
@@ -196,7 +202,7 @@ found:
 
 				if (!strcmp(os->name, "device")) {
 					devn = o->v.string;
-					if (strcmp(devn, dev->dev_name) != 0)
+					if (!swlib_match_name(dev, devn))
 						devn = NULL;
 				} else if (!strcmp(os->name, "vlan")) {
 					vlan = o->v.string;