X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=macvlan.c;h=a0f11ae1da1c52781c3dd630c15e5f1bfcc97619;hp=bf813407726bb3bf48b3886b9181f4633bcab79c;hb=39d9ceeb96162a83a3f5fa63e6aaa1ccb38caa62;hpb=5dd87fd8ad3a42c71d90a8fecc893af973e552bf

diff --git a/macvlan.c b/macvlan.c
index bf81340..a0f11ae 100644
--- a/macvlan.c
+++ b/macvlan.c
@@ -17,7 +17,11 @@
 #include <stdio.h>
 #include <assert.h>
 #include <errno.h>
+#include <net/ethernet.h>
+
+#ifdef linux
 #include <netinet/ether.h>
+#endif
 
 #include "netifd.h"
 #include "device.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,6 +222,7 @@ macvlan_reload(struct device *dev, struct blob_attr *attr)
 		macvlan_config_init(dev);
 	}
 
+	free(mvdev->config_data);
 	mvdev->config_data = attr;
 	return ret;
 }
@@ -245,7 +255,6 @@ macvlan_create(const char *name, struct blob_attr *attr)
 const 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,