X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=tunnel.c;h=4a6c4093f3fa96bf26ca652c1ed71c4f7a8533ef;hb=2d38e935ec6d5ad0cd3890fde6c2538f035186eb;hp=aa60019c18102046bc6cad4f1202aecf29b33701;hpb=e757e7d352a244e20a0c32fec96b35e5893d62ea;p=project%2Fnetifd.git

diff --git a/tunnel.c b/tunnel.c
index aa60019..4a6c409 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);
 
@@ -68,11 +67,14 @@ tunnel_create(const char *name, struct blob_attr *attr)
 	struct device *dev;
 
 	tun = calloc(1, sizeof(*tun));
+	if (!tun)
+		return NULL;
+
 	dev = &tun->dev;
 	device_init(dev, &tunnel_device_type, 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, &tunnel_device_type, attr);
 	device_set_present(dev, true);
 
 	return dev;