struct vlan_device *vldev;
vldev = container_of(iface, struct vlan_device, dev);
- remove_device_user(&vldev->dep);
- cleanup_device(&vldev->dev);
+ device_remove_user(&vldev->dep);
+ device_cleanup(&vldev->dev);
free(vldev);
}
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;
}
vldev = container_of(dep, struct vlan_device, dep);
switch(ev) {
case DEV_EVENT_ADD:
- set_device_present(&vldev->dev, true);
+ device_set_present(&vldev->dev, true);
break;
case DEV_EVENT_REMOVE:
- set_device_present(&vldev->dev, false);
+ device_set_present(&vldev->dev, false);
break;
default:
break;
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;
vldev->id = id;
vldev->dep.cb = vlan_dev_cb;
- add_device_user(&vldev->dep, dev);
+ device_add_user(&vldev->dep, dev);
return &vldev->dev;
}
-static inline char *split_vlan(char *s)
+static char *split_vlan(char *s)
{
s = strchr(s, '.');
if (!s)
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 = get_device(buf, create);
- if (!iface && !create)
+ dev = device_get(buf, create);
+ if (!dev && !create)
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;
}