projects
/
project
/
netifd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add support for multiple config_param_list::next pointers
[project/netifd.git]
/
vlan.c
diff --git
a/vlan.c
b/vlan.c
index
1755777
..
18cb939
100644
(file)
--- 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);
vldev = container_of(iface, struct vlan_device, dev);
device_remove_user(&vldev->dep);
-
cleanup_device
(&vldev->dev);
+
device_cleanup
(&vldev->dev);
free(vldev);
}
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);
if (!up) {
vldev->set_state(dev, false);
system_vlan_del(dev);
-
release_devic
e(vldev->dep.dev);
+
device_releas
e(vldev->dep.dev);
return 0;
}
return 0;
}
- ret =
claim_device
(vldev->dep.dev);
+ ret =
device_claim
(vldev->dep.dev);
if (ret)
return ret;
system_vlan_add(vldev->dep.dev, vldev->id);
ret = vldev->set_state(dev, true);
if (ret)
if (ret)
return ret;
system_vlan_add(vldev->dep.dev, vldev->id);
ret = vldev->set_state(dev, true);
if (ret)
-
release_devic
e(vldev->dep.dev);
+
device_releas
e(vldev->dep.dev);
return ret;
}
return ret;
}
@@
-55,10
+55,10
@@
static void vlan_dev_cb(struct device_user *dep, enum device_event ev)
vldev = container_of(dep, struct vlan_device, dep);
switch(ev) {
case DEV_EVENT_ADD:
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:
break;
case DEV_EVENT_REMOVE:
-
set_device
_present(&vldev->dev, false);
+
device_set
_present(&vldev->dev, false);
break;
default:
break;
break;
default:
break;
@@
-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);
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->set_state = vldev->dev.set_state;
vldev->dev.set_state = vlan_set_device_state;
@@
-100,7
+100,7
@@
static struct device *get_vlan_device(struct device *dev, int id, bool create)
vldev->id = id;
vldev->dep.cb = vlan_dev_cb;
vldev->id = id;
vldev->dep.cb = vlan_dev_cb;
-
add_device
_user(&vldev->dep, dev);
+
device_add
_user(&vldev->dep, dev);
return &vldev->dev;
}
return &vldev->dev;
}
@@
-129,7
+129,7
@@
struct device *get_vlan_device_chain(const char *ifname, bool create)
return NULL;
s = split_vlan(buf);
return NULL;
s = split_vlan(buf);
- iface =
get_device
(buf, create);
+ iface =
device_get
(buf, create);
if (!iface && !create)
goto error;
if (!iface && !create)
goto error;