X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=vlan.c;h=28e561b61dd2aa5523ecff3466bb21e7ed022f34;hb=52c919d0d38f3b788155de06b929d4e3449e1a72;hp=45896751d39241d240b2596d85dbeff8b1373303;hpb=b35fd5d5788184f685520352962f1a727ea91c1e;p=project%2Fnetifd.git diff --git a/vlan.c b/vlan.c index 4589675..28e561b 100644 --- a/vlan.c +++ b/vlan.c @@ -70,19 +70,28 @@ static void vlan_dev_set_name(struct vlan_device *vldev, struct device *dev) 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; } @@ -113,17 +122,19 @@ static struct device *get_vlan_device(struct device *dev, int id, bool create) if (!create) return NULL; + D(DEVICE, "Create vlan device '%s.%d'\n", dev->ifname, id); + vldev = calloc(1, sizeof(*vldev)); + 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; - vlan_dev_set_name(vldev, dev); - vldev->dep.cb = vlan_dev_cb; device_add_user(&vldev->dep, dev);