X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=macvlan.c;h=ffadfd4d77b501295985c5881cb29ba17eb12635;hp=9c03cd8191dc1d61295ad01c705f57734a3d1b2e;hb=7f6be657e2dabc185417520de4d0d0de2580c27d;hpb=f35b76c61baf68dc5dd8440fc06d860f8dfacc44

diff --git a/macvlan.c b/macvlan.c
index 9c03cd8..ffadfd4 100644
--- 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,10 +253,9 @@ macvlan_create(const char *name, struct blob_attr *attr)
 	return dev;
 }
 
-const struct device_type macvlan_device_type = {
+struct device_type macvlan_device_type = {
 	.name = "MAC VLAN",
 	.config_params = &macvlan_attr_list,
-
 	.create = macvlan_create,
 	.config_init = macvlan_config_init,
 	.reload = macvlan_reload,