wireless: add retry_setup_failed to status notification

[project/netifd.git] / tunnel.c

diff --git a/tunnel.c b/tunnel.c
index cdb83f0..4a6c409 100644 (file)
--- a/tunnel.c
+++ b/tunnel.c
@@ -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;