proto: move the dns search option handling to the core

[project/netifd.git] / vlan.c

diff --git a/vlan.c b/vlan.c
index b906cd5..1e06280 100644 (file)
--- a/vlan.c
+++ b/vlan.c
@@ -19,7 +19,7 @@ static void free_vlan_if(struct device *iface)
 
        vldev = container_of(iface, struct vlan_device, dev);
        device_remove_user(&vldev->dep);
-       cleanup_device(&vldev->dev);
+       device_cleanup(&vldev->dev);
        free(vldev);
 }
 
@@ -32,18 +32,18 @@ static int vlan_set_device_state(struct device *dev, bool up)
        if (!up) {
                vldev->set_state(dev, false);
                system_vlan_del(dev);
-               release_device(vldev->dep.dev);
+               device_release(&vldev->dep);
                return 0;
        }
 
-       ret = claim_device(vldev->dep.dev);
+       ret = device_claim(&vldev->dep);
        if (ret)
                return ret;
 
        system_vlan_add(vldev->dep.dev, vldev->id);
        ret = vldev->set_state(dev, true);
        if (ret)
-               release_device(vldev->dep.dev);
+               device_release(&vldev->dep);
 
        return ret;
 }
@@ -55,10 +55,10 @@ static void vlan_dev_cb(struct device_user *dep, enum device_event ev)
        vldev = container_of(dep, struct vlan_device, dep);
        switch(ev) {
        case DEV_EVENT_ADD:
-               set_device_present(&vldev->dev, true);
+               device_set_present(&vldev->dev, true);
                break;
        case DEV_EVENT_REMOVE:
-               set_device_present(&vldev->dev, false);
+               device_set_present(&vldev->dev, false);
                break;
        default:
                break;
@@ -69,6 +69,7 @@ static struct device *get_vlan_device(struct device *dev, int id, bool create)
 {
        static const struct device_type vlan_type = {
                .name = "VLAN",
+               .config_params = &device_attr_list,
                .free = free_vlan_if,
        };
        struct vlan_device *vldev;
@@ -92,7 +93,8 @@ static struct device *get_vlan_device(struct device *dev, int id, bool create)
        vldev = calloc(1, sizeof(*vldev));
        snprintf(vldev->dev.ifname, IFNAMSIZ, "%s.%d", dev->ifname, id);
 
-       init_device(&vldev->dev, &vlan_type, NULL);
+       device_init(&vldev->dev, &vlan_type, NULL);
+       vldev->dev.default_config = true;
 
        vldev->set_state = vldev->dev.set_state;
        vldev->dev.set_state = vlan_set_device_state;
@@ -120,7 +122,7 @@ out:
 
 struct device *get_vlan_device_chain(const char *ifname, bool create)
 {
-       struct device *iface = NULL;
+       struct device *dev = NULL;
        char *buf, *s, *next, *err = NULL;
        int id;
 
@@ -129,8 +131,8 @@ struct device *get_vlan_device_chain(const char *ifname, bool create)
                return NULL;
 
        s = split_vlan(buf);
-       iface = get_device(buf, create);
-       if (!iface && !create)
+       dev = device_get(buf, create);
+       if (!dev && !create)
                goto error;
 
        do {
@@ -139,8 +141,8 @@ struct device *get_vlan_device_chain(const char *ifname, bool create)
                if (err && *err)
                        goto error;
 
-               iface = get_vlan_device(iface, id, create);
-               if (!iface)
+               dev = get_vlan_device(dev, id, create);
+               if (!dev)
                        goto error;
 
                s = next;
@@ -149,8 +151,8 @@ struct device *get_vlan_device_chain(const char *ifname, bool create)
        } while (1);
 
 error:
-       iface = NULL;
+       dev = NULL;
 out:
        free(buf);
-       return iface;
+       return dev;
 }