+/*
+ * 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>
if (!up) {
vldev->set_state(dev, false);
system_vlan_del(dev);
- release_device(vldev->dep.dev);
+ device_release(&vldev->dep);
return 0;
}
- ret = device_claim(vldev->dep.dev);
+ ret = device_claim(&vldev->dep);
if (ret)
return ret;
system_vlan_add(vldev->dep.dev, vldev->id);
ret = vldev->set_state(dev, true);
if (ret)
- release_device(vldev->dep.dev);
+ device_release(&vldev->dep);
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;
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;
}
{
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;
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);
struct device *get_vlan_device_chain(const char *ifname, bool create)
{
- struct device *iface = NULL;
+ struct device *dev = NULL;
char *buf, *s, *next, *err = NULL;
int id;
return NULL;
s = split_vlan(buf);
- iface = device_get(buf, create);
- if (!iface && !create)
+ dev = device_get(buf, create);
+ if (!dev)
goto error;
do {
if (err && *err)
goto error;
- iface = get_vlan_device(iface, id, create);
- if (!iface)
+ dev = get_vlan_device(dev, id, create);
+ if (!dev)
goto error;
s = next;
} while (1);
error:
- iface = NULL;
+ dev = NULL;
out:
free(buf);
- return iface;
+ return dev;
}