delete devices before recreating them

[project/netifd.git] / device.c

diff --git a/device.c b/device.c
index b260d50..42b78e3 100644 (file)
--- a/device.c
+++ b/device.c
@@ -228,6 +228,16 @@ struct device *device_get(const char *name, bool create)
        return dev;
 }
 
+static void
+device_delete(struct device *dev)
+{
+       if (!dev->avl.key)
+               return;
+
+       avl_delete(&devices, &dev->avl);
+       dev->avl.key = NULL;
+}
+
 void device_cleanup(struct device *dev)
 {
        struct device_user *dep, *tmp;
@@ -240,8 +250,7 @@ void device_cleanup(struct device *dev)
                dep->cb(dep, DEV_EVENT_REMOVE);
        }
 
-       if (dev->avl.key)
-               avl_delete(&devices, &dev->avl);
+       device_delete(dev);
 }
 
 void device_set_present(struct device *dev, bool state)
@@ -298,6 +307,20 @@ device_free_unused(struct device *dev)
                __device_free_unused(dev);
 }
 
+void
+device_init_pending(void)
+{
+       struct device *dev, *tmp;
+
+       avl_for_each_element_safe(&devices, dev, avl, tmp) {
+               if (!dev->config_pending)
+                       continue;
+
+               dev->type->config_init(dev);
+               dev->config_pending = false;
+       }
+}
+
 enum dev_change_type
 device_reload_config(struct device *dev, struct blob_attr *attr)
 {
@@ -354,29 +377,45 @@ device_create(const char *name, const struct device_type *type,
        enum dev_change_type change;
 
        D(DEVICE, "Create new device '%s' (%s)\n", name, type->name);
+       config = config_memdup(config);
+       if (!config)
+               return NULL;
+
        odev = device_get(name, false);
        if (odev) {
                change = device_check_config(odev, config);
                switch (change) {
                case DEV_CONFIG_APPLIED:
+                       D(DEVICE, "Device '%s': config applied\n", odev->ifname);
                        free(odev->config);
-                       odev->config = config_memdup(config);
+                       odev->config = config;
                        if (odev->present) {
                                device_set_present(odev, false);
                                device_set_present(odev, true);
                        }
-                       /* fall through */
+                       free(config);
+                       return odev;
                case DEV_CONFIG_NO_CHANGE:
+                       D(DEVICE, "Device '%s': no configuration change\n", odev->ifname);
+                       free(config);
                        return odev;
                case DEV_CONFIG_RECREATE:
+                       D(DEVICE, "Device '%s': recreate device\n", odev->ifname);
+                       device_delete(odev);
                        break;
                }
        }
 
        dev = type->create(config);
-       dev->config = config_memdup(config);
+       if (!dev)
+               return NULL;
+
+       dev->config = config;
        if (odev)
                device_replace(dev, odev);
 
+       if (!config_init && dev->config_pending)
+               type->config_init(dev);
+
        return dev;
 }