}
ret = device_claim(&vldev->dep);
- if (ret)
+ if (ret < 0)
return ret;
system_vlan_add(vldev->dep.dev, vldev->id);
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;
+ bool new_state = false;
vldev = container_of(dep, struct vlan_device, dep);
switch(ev) {
case DEV_EVENT_ADD:
- device_set_present(&vldev->dev, true);
- break;
+ new_state = true;
case DEV_EVENT_REMOVE:
- device_set_present(&vldev->dev, false);
+ device_set_present(&vldev->dev, new_state);
+ break;
+ case DEV_EVENT_LINK_UP:
+ new_state = true;
+ case DEV_EVENT_LINK_DOWN:
+ device_set_link(&vldev->dev, new_state);
+ break;
+ case DEV_EVENT_UPDATE_IFNAME:
+ vlan_dev_set_name(vldev, dep->dev);
+ device_broadcast_event(&vldev->dev, ev);
+ break;
+ case DEV_EVENT_TOPO_CHANGE:
+ /* Propagate topo changes */
+ device_broadcast_event(&vldev->dev, DEV_EVENT_TOPO_CHANGE);
break;
default:
break;
static const struct device_type vlan_type = {
.name = "VLAN",
.config_params = &device_attr_list,
+ .keep_link_status = true,
.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;
if (!create)
return NULL;
+ D(DEVICE, "Create vlan device '%s.%d'\n", dev->ifname, id);
+
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);
s = split_vlan(buf);
dev = device_get(buf, create);
- if (!dev && !create)
+ if (!dev)
goto error;
do {