only show the "Create new device.." message if there is no old device

[project/netifd.git] / device.c

diff --git a/device.c b/device.c
index 44541e2..bceba62 100644 (file)
--- a/device.c
+++ b/device.c
@@ -141,8 +141,11 @@ int device_claim(struct device_user *dep)
        ret = dev->set_state(dev, true);
        if (ret == 0)
                device_broadcast_event(dev, DEV_EVENT_UP);
-       else
+       else {
+               D(DEVICE, "claim device %s failed: %d\n", dev->ifname, ret);
                dev->active = 0;
+               dep->claimed = false;
+       }
 
        return ret;
 }
@@ -259,6 +262,7 @@ void device_cleanup(struct device *dev)
                        continue;
 
                dep->cb(dep, DEV_EVENT_REMOVE);
+               device_release(dep);
        }
 
        device_delete(dev);
@@ -335,24 +339,22 @@ device_init_pending(void)
 enum dev_change_type
 device_reload_config(struct device *dev, struct blob_attr *attr)
 {
-       struct blob_attr *tb[__DEV_ATTR_MAX], *tb1[__DEV_ATTR_MAX];
-       const struct config_param_list *params = dev->type->config_params;
-
-       blobmsg_parse(dev_attrs, __DEV_ATTR_MAX, tb,
-               blob_data(attr), blob_len(attr));
-       if (dev->config)
-               blobmsg_parse(dev_attrs, __DEV_ATTR_MAX, tb1,
-                       blob_data(dev->config), blob_len(dev->config));
-       else
-               memset(tb1, 0, sizeof(tb1));
+       struct blob_attr *tb[__DEV_ATTR_MAX];
+       const struct config_param_list *cfg = dev->type->config_params;
 
-       if (!config_diff(tb, tb1, dev->type->config_params, NULL))
+       if (config_check_equal(dev->config, attr, cfg))
                return DEV_CONFIG_NO_CHANGE;
 
-       device_init_settings(dev, tb);
-       if (params == &device_attr_list)
+       if (cfg == &device_attr_list) {
+               memset(tb, 0, sizeof(tb));
+
+               if (dev->config)
+                       blobmsg_parse(dev_attrs, __DEV_ATTR_MAX, tb,
+                               blob_data(attr), blob_len(attr));
+
+               device_init_settings(dev, tb);
                return DEV_CONFIG_APPLIED;
-       else
+       } else
                return DEV_CONFIG_RECREATE;
 }
 
@@ -379,8 +381,9 @@ device_replace(struct device *dev, struct device *odev)
                device_set_present(odev, false);
 
        list_for_each_entry_safe(dep, tmp, &odev->users, list) {
-               device_remove_user(dep);
-               device_add_user(dep, dev);
+               device_release(dep);
+               list_move_tail(&dep->list, &dev->users);
+               dep->dev = dev;
        }
        device_free(odev);
 
@@ -421,7 +424,6 @@ device_create(const char *name, const struct device_type *type,
        struct device *odev = NULL, *dev;
        enum dev_change_type change;
 
-       D(DEVICE, "Create new device '%s' (%s)\n", name, type->name);
        config = config_memdup(config);
        if (!config)
                return NULL;
@@ -449,7 +451,8 @@ device_create(const char *name, const struct device_type *type,
                        device_delete(odev);
                        break;
                }
-       }
+       } else
+               D(DEVICE, "Create new device '%s' (%s)\n", name, type->name);
 
        dev = type->create(config);
        if (!dev)