netifd: propagate error code on netifd_reload()

[project/netifd.git] / macvlan.c

diff --git a/macvlan.c b/macvlan.c
index 9c03cd8..021d394 100644 (file)
--- a/macvlan.c
+++ b/macvlan.c
@@ -44,6 +44,9 @@ static const struct blobmsg_policy macvlan_attrs[__MACVLAN_ATTR_MAX] = {
 static const struct uci_blob_param_list macvlan_attr_list = {
        .n_params = __MACVLAN_ATTR_MAX,
        .params = macvlan_attrs,
+
+       .n_next = 1,
+       .next = { &device_attr_list },
 };
 
 struct macvlan_device {
@@ -69,12 +72,6 @@ macvlan_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;
        }
@@ -137,6 +134,7 @@ macvlan_free(struct device *dev)
 
        mvdev = container_of(dev, struct macvlan_device, dev);
        device_remove_user(&mvdev->parent);
+       free(mvdev->config_data);
        free(mvdev);
 }
 
@@ -194,6 +192,7 @@ macvlan_reload(struct device *dev, struct blob_attr *attr)
        struct macvlan_device *mvdev;
 
        mvdev = container_of(dev, struct macvlan_device, dev);
+       attr = blob_memdup(attr);
 
        blobmsg_parse(device_attr_list.params, __DEV_ATTR_MAX, tb_dev,
                blob_data(attr), blob_len(attr));
@@ -223,12 +222,14 @@ macvlan_reload(struct device *dev, struct blob_attr *attr)
                macvlan_config_init(dev);
        }
 
+       free(mvdev->config_data);
        mvdev->config_data = attr;
        return ret;
 }
 
 static struct device *
-macvlan_create(const char *name, struct blob_attr *attr)
+macvlan_create(const char *name, struct device_type *devtype,
+       struct blob_attr *attr)
 {
        struct macvlan_device *mvdev;
        struct device *dev = NULL;
@@ -238,7 +239,7 @@ macvlan_create(const char *name, struct blob_attr *attr)
                return NULL;
 
        dev = &mvdev->dev;
-       device_init(dev, &macvlan_device_type, name);
+       device_init(dev, devtype, name);
        dev->config_pending = true;
 
        mvdev->set_state = dev->set_state;
@@ -252,13 +253,17 @@ macvlan_create(const char *name, struct blob_attr *attr)
        return dev;
 }
 
-const struct device_type macvlan_device_type = {
-       .name = "MAC VLAN",
+static struct device_type macvlan_device_type = {
+       .name = "macvlan",
        .config_params = &macvlan_attr_list,
-
        .create = macvlan_create,
        .config_init = macvlan_config_init,
        .reload = macvlan_reload,
        .free = macvlan_free,
        .dump_info = macvlan_dump_info,
 };
+
+static void __init macvlan_device_type_init(void)
+{
+       device_type_add(&macvlan_device_type);
+}