interface-ip: DNS name server sorting support in resolv.conf.auto

[project/netifd.git] / vlandev.c

diff --git a/vlandev.c b/vlandev.c
index 36a5c63..b8f7a25 100644 (file)
--- a/vlandev.c
+++ b/vlandev.c
@@ -63,12 +63,6 @@ vlandev_base_cb(struct device_user *dev, enum device_event ev)
        case DEV_EVENT_REMOVE:
                device_set_present(&mvdev->dev, false);
                break;
-       case DEV_EVENT_LINK_UP:
-               device_set_link(&mvdev->dev, true);
-               break;
-       case DEV_EVENT_LINK_DOWN:
-               device_set_link(&mvdev->dev, false);
-               break;
        default:
                return;
        }
@@ -131,6 +125,7 @@ vlandev_free(struct device *dev)
 
        mvdev = container_of(dev, struct vlandev_device, dev);
        device_remove_user(&mvdev->parent);
+       free(mvdev->config_data);
        free(mvdev);
 }
 
@@ -185,6 +180,7 @@ vlandev_reload(struct device *dev, struct blob_attr *attr)
        struct vlandev_device *mvdev;
 
        mvdev = container_of(dev, struct vlandev_device, dev);
+       attr = blob_memdup(attr);
 
        blobmsg_parse(device_attr_list.params, __DEV_ATTR_MAX, tb_dev,
                blob_data(attr), blob_len(attr));
@@ -214,12 +210,14 @@ vlandev_reload(struct device *dev, struct blob_attr *attr)
                vlandev_config_init(dev);
        }
 
+       free(mvdev->config_data);
        mvdev->config_data = attr;
        return ret;
 }
 
 static struct device *
-vlandev_create(const char *name, struct blob_attr *attr)
+vlandev_create(const char *name, struct device_type *devtype,
+              struct blob_attr *attr)
 {
        struct vlandev_device *mvdev;
        struct device *dev = NULL;
@@ -229,7 +227,7 @@ vlandev_create(const char *name, struct blob_attr *attr)
                return NULL;
 
        dev = &mvdev->dev;
-       device_init(dev, &vlandev_device_type, name);
+       device_init(dev, devtype, name);
        dev->config_pending = true;
 
        mvdev->set_state = dev->set_state;
@@ -243,10 +241,9 @@ vlandev_create(const char *name, struct blob_attr *attr)
        return dev;
 }
 
-const struct device_type vlandev_device_type = {
+struct device_type vlandev_device_type = {
        .name = "VLANDEV",
        .config_params = &vlandev_attr_list,
-
        .create = vlandev_create,
        .config_init = vlandev_config_init,
        .reload = vlandev_reload,