X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=vlan.c;h=d00cda0fd112e43c487869921eeeb314e226322f;hp=208ff73d594e572c1cfc766e475c2dd7f0d51ee6;hb=69b2dcb92b8402b9c6df4d6a041a890fe6468e18;hpb=0b461898555d81efe1b57ec1cd9b9b1529cecd0f diff --git a/vlan.c b/vlan.c index 208ff73..d00cda0 100644 --- a/vlan.c +++ b/vlan.c @@ -32,18 +32,18 @@ static int vlan_set_device_state(struct device *dev, bool up) if (!up) { vldev->set_state(dev, false); system_vlan_del(dev); - release_device(vldev->dep.dev); + device_release(&vldev->dep); return 0; } - ret = claim_device(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; } @@ -92,7 +92,7 @@ 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); - init_device(&vldev->dev, &vlan_type, NULL); + device_init(&vldev->dev, &vlan_type, NULL); vldev->set_state = vldev->dev.set_state; vldev->dev.set_state = vlan_set_device_state;