X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=vlan.c;h=d00cda0fd112e43c487869921eeeb314e226322f;hp=ce9d2d7a8e9dfc7234d0355b6e5107fd25cc43f6;hb=25cb39d2bcf72442c7d793a71b5a3950f701e302;hpb=3062736f3cf323e3b0f95c4c97fdcf57ab768590

diff --git a/vlan.c b/vlan.c
index ce9d2d7..d00cda0 100644
--- a/vlan.c
+++ b/vlan.c
@@ -19,7 +19,7 @@ static void free_vlan_if(struct device *iface)
 
 	vldev = container_of(iface, struct vlan_device, dev);
 	device_remove_user(&vldev->dep);
-	cleanup_device(&vldev->dev);
+	device_cleanup(&vldev->dev);
 	free(vldev);
 }
 
@@ -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;
@@ -129,7 +129,7 @@ struct device *get_vlan_device_chain(const char *ifname, bool create)
 		return NULL;
 
 	s = split_vlan(buf);
-	iface = get_device(buf, create);
+	iface = device_get(buf, create);
 	if (!iface && !create)
 		goto error;