IPv6: fix device_prefix vlist_key to not include prefix class

[project/netifd.git] / device.c

diff --git a/device.c b/device.c
index bc5bc46..1c0736f 100644 (file)
--- a/device.c
+++ b/device.c
@@ -180,23 +180,22 @@ static void __init dev_init(void)
        avl_init(&devices, avl_strcmp, true, NULL);
 }
 
-
-static void __device_broadcast_event(struct list_head *head, enum device_event ev)
+static int device_broadcast_cb(void *ctx, struct safe_list *list)
 {
-       struct device_user *dep, *tmp;
-
-       list_for_each_entry_safe(dep, tmp, head, list) {
-               if (!dep->cb)
-                       continue;
+       struct device_user *dep = container_of(list, struct device_user, list);
+       int *ev = ctx;
 
-               dep->cb(dep, ev);
-       }
+       if (dep->cb)
+               dep->cb(dep, *ev);
+       return 0;
 }
 
 void device_broadcast_event(struct device *dev, enum device_event ev)
 {
-       __device_broadcast_event(&dev->aliases, ev);
-       __device_broadcast_event(&dev->users, ev);
+       int dev_ev = ev;
+
+       safe_list_for_each(&dev->aliases, device_broadcast_cb, &dev_ev);
+       safe_list_for_each(&dev->users, device_broadcast_cb, &dev_ev);
 }
 
 int device_claim(struct device_user *dep)
@@ -263,8 +262,8 @@ void device_init_virtual(struct device *dev, const struct device_type *type, con
                strncpy(dev->ifname, name, IFNAMSIZ);
 
        D(DEVICE, "Initialize device '%s'\n", dev->ifname);
-       INIT_LIST_HEAD(&dev->users);
-       INIT_LIST_HEAD(&dev->aliases);
+       INIT_SAFE_LIST(&dev->users);
+       INIT_SAFE_LIST(&dev->aliases);
        dev->type = type;
 
        if (!dev->set_state)
@@ -343,19 +342,21 @@ device_delete(struct device *dev)
        dev->avl.key = NULL;
 }
 
-void device_cleanup(struct device *dev)
+static int device_cleanup_cb(void *ctx, struct safe_list *list)
 {
-       struct device_user *dep, *tmp;
-
-       D(DEVICE, "Clean up device '%s'\n", dev->ifname);
-       list_for_each_entry_safe(dep, tmp, &dev->users, list) {
-               if (!dep->cb)
-                       continue;
-
+       struct device_user *dep = container_of(list, struct device_user, list);
+       if (dep->cb)
                dep->cb(dep, DEV_EVENT_REMOVE);
-               device_release(dep);
-       }
 
+       device_release(dep);
+       return 0;
+}
+
+void device_cleanup(struct device *dev)
+{
+       D(DEVICE, "Clean up device '%s'\n", dev->ifname);
+       safe_list_for_each(&dev->users, device_cleanup_cb, NULL);
+       safe_list_for_each(&dev->aliases, device_cleanup_cb, NULL);
        device_delete(dev);
 }
 
@@ -394,7 +395,10 @@ static int device_refcount(struct device *dev)
        struct list_head *list;
        int count = 0;
 
-       list_for_each(list, &dev->users)
+       list_for_each(list, &dev->users.list)
+               count++;
+
+       list_for_each(list, &dev->aliases.list)
                count++;
 
        return count;
@@ -402,7 +406,7 @@ static int device_refcount(struct device *dev)
 
 void device_add_user(struct device_user *dep, struct device *dev)
 {
-       struct list_head *head;
+       struct safe_list *head;
 
        if (dep->dev)
                device_remove_user(dep);
@@ -416,7 +420,8 @@ void device_add_user(struct device_user *dep, struct device *dev)
                head = &dev->aliases;
        else
                head = &dev->users;
-       list_add_tail(&dep->list, head);
+
+       safe_list_add(&dep->list, head);
        D(DEVICE, "Add user for device '%s', refcount=%d\n", dev->ifname, device_refcount(dev));
 
        if (dep->cb && dev->present) {
@@ -439,7 +444,9 @@ device_free(struct device *dev)
 static void
 __device_free_unused(struct device *dev)
 {
-       if (!list_empty(&dev->users) || dev->current_config || __devlock)
+       if (!safe_list_empty(&dev->users) ||
+               !safe_list_empty(&dev->aliases) ||
+           dev->current_config || __devlock)
                return;
 
        device_free(dev);
@@ -456,7 +463,7 @@ void device_remove_user(struct device_user *dep)
        if (dep->claimed)
                device_release(dep);
 
-       list_del(&dep->list);
+       safe_list_del(&dep->list);
        dep->dev = NULL;
        D(DEVICE, "Remove user for device '%s', refcount=%d\n", dev->ifname, device_refcount(dev));
        __device_free_unused(dev);
@@ -532,9 +539,10 @@ device_replace(struct device *dev, struct device *odev)
        if (present)
                device_set_present(odev, false);
 
-       list_for_each_entry_safe(dep, tmp, &odev->users, list) {
+       list_for_each_entry_safe(dep, tmp, &odev->users.list, list.list) {
                device_release(dep);
-               list_move_tail(&dep->list, &dev->users);
+               safe_list_del(&dep->list);
+               safe_list_add(&dep->list, &dev->users);
                dep->dev = dev;
        }
        device_free(odev);
@@ -584,6 +592,10 @@ device_create(const char *name, const struct device_type *type,
        if (odev) {
                odev->current_config = true;
                change = device_set_config(odev, type, config);
+               if (odev->external) {
+                       system_if_apply_settings(odev, &odev->settings);
+                       change = DEV_CONFIG_APPLIED;
+               }
                switch (change) {
                case DEV_CONFIG_RESTART:
                case DEV_CONFIG_APPLIED:
@@ -658,7 +670,7 @@ device_dump_status(struct blob_buf *b, struct device *dev)
                if (st.flags & DEV_OPT_MTU)
                        blobmsg_add_u32(b, "mtu", st.mtu);
                if (st.flags & DEV_OPT_MACADDR)
-                       blobmsg_add_string(b, "macaddr", ether_ntoa((struct ether_addr *) st.macaddr));
+                       blobmsg_add_string(b, "macaddr", format_macaddr(st.macaddr));
                if (st.flags & DEV_OPT_TXQUEUELEN)
                        blobmsg_add_u32(b, "txqueuelen", st.txqueuelen);
        }