X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=macvlan.c;h=021d3944fb1ccbee81d9f141539a39d1a47ab258;hp=f42f3e5a27dbfc1f329580b9d26bdc0cfd0b8c6e;hb=HEAD;hpb=7a3cfc37189aab8991cfaa7986f221d61127599d

diff --git a/macvlan.c b/macvlan.c
index f42f3e5..021d394 100644
--- a/macvlan.c
+++ b/macvlan.c
@@ -19,6 +19,10 @@
 #include <errno.h>
 #include <net/ethernet.h>
 
+#ifdef linux
+#include <netinet/ether.h>
+#endif
+
 #include "netifd.h"
 #include "device.h"
 #include "interface.h"
@@ -40,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 {
@@ -127,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);
 }
 
@@ -184,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));
@@ -213,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;
@@ -228,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;
@@ -242,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);
+}