X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=config.c;h=a7112f042a677426ab27baff8b8131e0bb4e3d40;hp=48c4fbff9358390cb8c16c8161c70128015e8487;hb=b5731bfbabaf7aab0fc47143bd6ad0b12cc3df0a;hpb=2d581d30932fb8130e459945c362e59e75beab51

diff --git a/config.c b/config.c
index 48c4fbf..a7112f0 100644
--- a/config.c
+++ b/config.c
@@ -53,18 +53,18 @@ config_section_idx(struct uci_section *s)
 }
 
 static int
-config_parse_bridge_interface(struct uci_section *s)
+config_parse_bridge_interface(struct uci_section *s, struct device_type *devtype)
 {
 	char *name;
 
-	name = alloca(strlen(s->e.name) + 4);
-	sprintf(name, "br-%s", s->e.name);
+	name = alloca(strlen(s->e.name) + strlen(devtype->name_prefix) + 2);
+	sprintf(name, "%s-%s", devtype->name_prefix, s->e.name);
 	blobmsg_add_string(&b, "name", name);
 
-	uci_to_blob(&b, s, bridge_device_type.config_params);
-	if (!device_create(name, &bridge_device_type, b.head)) {
-		D(INTERFACE, "Failed to create bridge for interface '%s'\n", s->e.name);
-		return -EINVAL;
+	uci_to_blob(&b, s, devtype->config_params);
+	if (!device_create(name, devtype, b.head)) {
+		D(INTERFACE, "Failed to create '%s' device for interface '%s'\n",
+			devtype->name, s->e.name);
 	}
 
 	blob_buf_init(&b, 0);
@@ -79,6 +79,7 @@ config_parse_interface(struct uci_section *s, bool alias)
 	const char *type = NULL, *disabled;
 	struct blob_attr *config;
 	bool bridge = false;
+	struct device_type *devtype = NULL;
 
 	disabled = uci_lookup_option_string(uci_ctx, s, "disabled");
 	if (disabled && !strcmp(disabled, "1"))
@@ -88,8 +89,12 @@ config_parse_interface(struct uci_section *s, bool alias)
 
 	if (!alias)
 		type = uci_lookup_option_string(uci_ctx, s, "type");
-	if (type && !strcmp(type, "bridge")) {
-		if (config_parse_bridge_interface(s))
+
+	if (type)
+		devtype = device_type_get(type);
+
+	if (devtype && devtype->bridge_capability) {
+		if (config_parse_bridge_interface(s, devtype))
 			return;
 
 		bridge = true;
@@ -157,7 +162,7 @@ config_init_devices(void)
 	uci_foreach_element(&uci_network->sections, e) {
 		const struct uci_blob_param_list *params = NULL;
 		struct uci_section *s = uci_to_section(e);
-		const struct device_type *devtype = NULL;
+		struct device_type *devtype = NULL;
 		struct device *dev;
 		const char *type, *name;
 
@@ -169,18 +174,8 @@ config_init_devices(void)
 			continue;
 
 		type = uci_lookup_option_string(uci_ctx, s, "type");
-		if (type) {
-			if (!strcmp(type, "8021ad"))
-				devtype = &vlandev_device_type;
-			else if (!strcmp(type, "8021q"))
-				devtype = &vlandev_device_type;
-			else if (!strcmp(type, "bridge"))
-				devtype = &bridge_device_type;
-			else if (!strcmp(type, "macvlan"))
-				devtype = &macvlan_device_type;
-			else if (!strcmp(type, "tunnel"))
-				devtype = &tunnel_device_type;
-		}
+		if (type)
+			devtype = device_type_get(type);
 
 		if (devtype)
 			params = devtype->config_params;
@@ -294,6 +289,18 @@ config_init_rules(void)
 
 	iprule_update_complete();
 }
+static int
+config_parse_global_ps_val(struct uci_section *globals, const char *option)
+{
+	const char *val = uci_lookup_option_string(
+			uci_ctx, globals, option);
+	int ret = 0;
+
+	if (val)
+		ret = strtol(val, 0, 10);
+
+	return ret;
+}
 
 static void
 config_init_globals(void)
@@ -306,6 +313,15 @@ config_init_globals(void)
 	const char *ula_prefix = uci_lookup_option_string(
 			uci_ctx, globals, "ula_prefix");
 	interface_ip_set_ula_prefix(ula_prefix);
+
+	const char *default_ps = uci_lookup_option_string(
+			uci_ctx, globals, "default_ps");
+
+	if (default_ps)
+		device_set_default_ps(strcmp(default_ps, "1") ? false : true,
+			config_parse_global_ps_val(globals, "default_xps_val"),
+			config_parse_global_ps_val(globals, "default_rps_val"),
+			config_parse_global_ps_val(globals, "default_rps_flow_cnt"));
 }
 
 static void
@@ -392,16 +408,20 @@ config_init_wireless(void)
 		vlist_flush(&wdev->interfaces);
 }
 
-void
+int
 config_init_all(void)
 {
+	int ret = 0;
+
 	uci_network = config_init_package("network");
 	if (!uci_network) {
 		fprintf(stderr, "Failed to load network config\n");
-		return;
+		return -1;
 	}
 
 	uci_wireless = config_init_package("wireless");
+	if (!uci_wireless)
+		ret = -1;
 
 	vlist_update(&interfaces);
 	config_init = true;
@@ -425,4 +445,6 @@ config_init_all(void)
 	interface_refresh_assignments(false);
 	interface_start_pending();
 	wireless_start_pending();
+
+	return ret;
 }