system-linux: switch to new ETHTOOL_xLINKSETTINGS API

[project/netifd.git] / macvlan.c

diff --git a/macvlan.c b/macvlan.c
index a0f11ae1da1c52781c3dd630c15e5f1bfcc97619..c4ebdd0d9249df55d8a5c31461d71578275bb3ac 100644 (file)
--- a/macvlan.c
+++ b/macvlan.c
@@ -17,11 +17,6 @@
 #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"
@@ -228,7 +223,8 @@ macvlan_reload(struct device *dev, struct blob_attr *attr)
 }
 
 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 +234,12 @@ macvlan_create(const char *name, struct blob_attr *attr)
                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;
@@ -252,8 +253,8 @@ 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,
@@ -261,3 +262,8 @@ const struct device_type macvlan_device_type = {
        .free = macvlan_free,
        .dump_info = macvlan_dump_info,
 };
+
+static void __init macvlan_device_type_init(void)
+{
+       device_type_add(&macvlan_device_type);
+}