system-linux: improve handling of device rename

[oweals/netifd.git] / tunnel.c

diff --git a/tunnel.c b/tunnel.c
index ec622d8d47ac10aa04762f803f5a831fdd536cd7..1383384075cf57e8e95b3edf31602e57eb159639 100644 (file)
--- a/tunnel.c
+++ b/tunnel.c
@@ -72,7 +72,13 @@ tunnel_create(const char *name, struct device_type *devtype,
                return NULL;
 
        dev = &tun->dev;
-       device_init(dev, devtype, name);
+
+       if (device_init(dev, devtype, name) < 0) {
+               device_cleanup(dev);
+               free(tun);
+               return NULL;
+       }
+
        tun->set_state = dev->set_state;
        dev->set_state = tunnel_set_state;
        device_apply_config(dev, devtype, attr);
@@ -90,11 +96,14 @@ tunnel_free(struct device *dev)
 }
 
 struct device_type tunnel_device_type = {
-       .name = "IP tunnel",
+       .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);
+}