tunnel: Use tunnel as device type name

[project/netifd.git] / tunnel.c

diff --git a/tunnel.c b/tunnel.c
index aa670a3974def3f179c20df0d3bbb8355e21daac..3fa3e2152ad1e63ed1e298684467cccc64ac6a69 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);
 
@@ -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_apply_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);
+}