include route/address flags in vlist comparison

[project/netifd.git] / device.c

diff --git a/device.c b/device.c
index 84e6528..0560a70 100644 (file)
--- a/device.c
+++ b/device.c
@@ -112,7 +112,6 @@ static void simple_device_free(struct device *dev)
 {
        if (dev->parent.dev)
                device_remove_user(&dev->parent);
-       device_cleanup(dev);
        free(dev);
 }
 
@@ -162,8 +161,6 @@ static void alias_device_free(struct device *dev)
 {
        struct alias_device *alias;
 
-       device_cleanup(dev);
-
        alias = container_of(dev, struct alias_device, dev);
        avl_delete(&aliases, &alias->avl);
        free(alias);
@@ -197,12 +194,11 @@ device_init_settings(struct device *dev, struct blob_attr **tb)
        struct device_settings *s = &dev->settings;
        struct blob_attr *cur;
        struct ether_addr *ea;
+       bool disabled = false;
 
        s->flags = 0;
-       dev->disabled = false;
-
        if ((cur = tb[DEV_ATTR_ENABLED]))
-               device_set_disabled(dev, !blobmsg_get_bool(cur));
+               disabled = !blobmsg_get_bool(cur);
 
        if ((cur = tb[DEV_ATTR_MTU])) {
                s->mtu = blobmsg_get_u32(cur);
@@ -215,12 +211,14 @@ device_init_settings(struct device *dev, struct blob_attr **tb)
        }
 
        if ((cur = tb[DEV_ATTR_MACADDR])) {
-               ea = ether_aton(blob_data(cur));
+               ea = ether_aton(blobmsg_data(cur));
                if (ea) {
                        memcpy(s->macaddr, ea, 6);
                        s->flags |= DEV_OPT_MACADDR;
                }
        }
+
+       device_set_disabled(dev, disabled);
 }
 
 static void __init dev_init(void)
@@ -311,7 +309,8 @@ void device_release(struct device_user *dep)
                return;
 
        device_broadcast_event(dev, DEV_EVENT_TEARDOWN);
-       dev->set_state(dev, false);
+       if (!dep->hotplug)
+               dev->set_state(dev, false);
        device_broadcast_event(dev, DEV_EVENT_DOWN);
 }
 
@@ -464,6 +463,12 @@ device_set_disabled(struct device *dev, bool value)
 
 void device_add_user(struct device_user *dep, struct device *dev)
 {
+       if (dep->dev)
+               device_remove_user(dep);
+
+       if (!dev)
+               return;
+
        dep->dev = dev;
        list_add_tail(&dep->list, &dev->users);
        if (dep->cb && dev->present) {
@@ -477,6 +482,8 @@ void
 device_free(struct device *dev)
 {
        __devlock++;
+       free(dev->config);
+       device_cleanup(dev);
        dev->type->free(dev);
        __devlock--;
 }
@@ -549,7 +556,7 @@ device_reload_config(struct device *dev, struct blob_attr *attr)
                                blob_data(attr), blob_len(attr));
 
                device_init_settings(dev, tb);
-               return DEV_CONFIG_APPLIED;
+               return DEV_CONFIG_RESTART;
        } else
                return DEV_CONFIG_RECREATE;
 }
@@ -629,11 +636,12 @@ device_create(const char *name, const struct device_type *type,
                odev->current_config = true;
                change = device_set_config(odev, type, config);
                switch (change) {
+               case DEV_CONFIG_RESTART:
                case DEV_CONFIG_APPLIED:
                        D(DEVICE, "Device '%s': config applied\n", odev->ifname);
                        free(odev->config);
                        odev->config = config;
-                       if (odev->present) {
+                       if (change == DEV_CONFIG_RESTART && odev->present) {
                                device_set_present(odev, false);
                                device_set_present(odev, true);
                        }