#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"
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 {
mvdev = container_of(dev, struct macvlan_device, dev);
device_remove_user(&mvdev->parent);
+ free(mvdev->config_data);
free(mvdev);
}
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));
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;
return NULL;
dev = &mvdev->dev;
- device_init(dev, &macvlan_device_type, name);
+ if (device_init(dev, devtype, name) < 0) {
+ device_cleanup(dev);
+ free(mvdev);
+ return NULL;
+ }
+
dev->config_pending = true;
mvdev->set_state = dev->set_state;
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);
+}