X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=tunnel.c;h=3fa3e2152ad1e63ed1e298684467cccc64ac6a69;hp=aa60019c18102046bc6cad4f1202aecf29b33701;hb=HEAD;hpb=e757e7d352a244e20a0c32fec96b35e5893d62ea

diff --git a/tunnel.c b/tunnel.c
index aa60019..3fa3e21 100644
--- a/tunnel.c
+++ b/tunnel.c
@@ -35,7 +35,7 @@ tunnel_set_state(struct device *dev, bool up)
 
 	ret = tun->set_state(dev, up);
 	if (ret || !up)
-		system_del_ip_tunnel(dev->ifname);
+		system_del_ip_tunnel(dev->ifname, dev->config);
 
 	return ret;
 }
@@ -49,12 +49,11 @@ tunnel_reload(struct device *dev, struct blob_attr *attr)
 	if (uci_blob_check_equal(dev->config, attr, cfg))
 		return DEV_CONFIG_NO_CHANGE;
 
-	if (attr) {
-		memset(tb_dev, 0, sizeof(tb_dev));
+	memset(tb_dev, 0, sizeof(tb_dev));
 
+	if (attr)
 		blobmsg_parse(device_attr_list.params, __DEV_ATTR_MAX, tb_dev,
 			blob_data(attr), blob_len(attr));
-	}
 
 	device_init_settings(dev, tb_dev);
 
@@ -62,17 +61,21 @@ tunnel_reload(struct device *dev, struct blob_attr *attr)
 }
 
 static struct device *
-tunnel_create(const char *name, struct blob_attr *attr)
+tunnel_create(const char *name, struct device_type *devtype,
+	struct blob_attr *attr)
 {
 	struct tunnel *tun;
 	struct device *dev;
 
 	tun = calloc(1, sizeof(*tun));
+	if (!tun)
+		return NULL;
+
 	dev = &tun->dev;
-	device_init(dev, &tunnel_device_type, name);
+	device_init(dev, devtype, name);
 	tun->set_state = dev->set_state;
 	dev->set_state = tunnel_set_state;
-	device_set_config(dev, &tunnel_device_type, attr);
+	device_apply_config(dev, devtype, attr);
 	device_set_present(dev, true);
 
 	return dev;
@@ -86,12 +89,15 @@ tunnel_free(struct device *dev)
 	free(tun);
 }
 
-const struct device_type tunnel_device_type = {
-	.name = "IP tunnel",
+struct device_type tunnel_device_type = {
+	.name = "tunnel",
 	.config_params = &tunnel_attr_list,
 	.reload = tunnel_reload,
 	.create = tunnel_create,
 	.free = tunnel_free,
 };
 
-
+static void __init tunnel_device_type_init(void)
+{
+	device_type_add(&tunnel_device_type);
+}