X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=vlan.c;h=f70420a257f71b77d5b6e95b1051a2a9a01b300a;hp=3085868a91568dac3748ee03f0bcf52f78e75474;hb=6f34c02e517689faa5b04809b448891228a44355;hpb=cd51d94890e819e6e72fd9dc221716131e69dea7

diff --git a/vlan.c b/vlan.c
index 3085868..f70420a 100644
--- 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>
@@ -48,6 +61,12 @@ static int vlan_set_device_state(struct device *dev, bool up)
 	return ret;
 }
 
+static void vlan_dev_set_name(struct vlan_device *vldev, struct device *dev)
+{
+	vldev->dev.hidden = dev->hidden;
+	snprintf(vldev->dev.ifname, IFNAMSIZ, "%s.%d", dev->ifname, vldev->id);
+}
+
 static void vlan_dev_cb(struct device_user *dep, enum device_event ev)
 {
 	struct vlan_device *vldev;
@@ -60,6 +79,10 @@ static void vlan_dev_cb(struct device_user *dep, enum device_event ev)
 	case DEV_EVENT_REMOVE:
 		device_set_present(&vldev->dev, false);
 		break;
+	case DEV_EVENT_UPDATE_IFNAME:
+		vlan_dev_set_name(vldev, dep->dev);
+		device_broadcast_event(&vldev->dev, ev);
+		break;
 	default:
 		break;
 	}
@@ -69,13 +92,14 @@ 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;
 	struct device_user *dep;
 
 	/* look for an existing interface before creating a new one */
-	list_for_each_entry(dep, &dev->users, list) {
+	list_for_each_entry(dep, &dev->users.list, list.list) {
 		if (dep->cb != vlan_dev_cb)
 			continue;
 
@@ -90,15 +114,16 @@ static struct device *get_vlan_device(struct device *dev, int id, bool create)
 		return NULL;
 
 	vldev = calloc(1, sizeof(*vldev));
-	snprintf(vldev->dev.ifname, IFNAMSIZ, "%s.%d", dev->ifname, id);
 
-	device_init(&vldev->dev, &vlan_type, NULL);
+	vldev->id = id;
+	vlan_dev_set_name(vldev, dev);
+
+	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;
 
-	vldev->id = id;
-
 	vldev->dep.cb = vlan_dev_cb;
 	device_add_user(&vldev->dep, dev);
 
@@ -130,7 +155,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 {