make vlan devices virtual to avoid avl tree issues with changing ifnames when bound...

[project/netifd.git] / vlan.c

diff --git a/vlan.c b/vlan.c
index 3085868..d1fb70b 100644 (file)
--- a/vlan.c
+++ b/vlan.c
@@ -1,3 +1,16 @@
+/*
+ * netifd - network interface daemon
+ * Copyright (C) 2012 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -69,6 +82,7 @@ static struct device *get_vlan_device(struct device *dev, int id, bool create)
 {
        static const struct device_type vlan_type = {
                .name = "VLAN",
+               .config_params = &device_attr_list,
                .free = free_vlan_if,
        };
        struct vlan_device *vldev;
@@ -92,7 +106,8 @@ static struct device *get_vlan_device(struct device *dev, int id, bool create)
        vldev = calloc(1, sizeof(*vldev));
        snprintf(vldev->dev.ifname, IFNAMSIZ, "%s.%d", dev->ifname, id);
 
-       device_init(&vldev->dev, &vlan_type, NULL);
+       device_init_virtual(&vldev->dev, &vlan_type, NULL);
+       vldev->dev.default_config = true;
 
        vldev->set_state = vldev->dev.set_state;
        vldev->dev.set_state = vlan_set_device_state;
@@ -130,7 +145,7 @@ struct device *get_vlan_device_chain(const char *ifname, bool create)
 
        s = split_vlan(buf);
        dev = device_get(buf, create);
-       if (!dev && !create)
+       if (!dev)
                goto error;
 
        do {