projects
/
project
/
netifd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix the ubus hotplug add/remove interface to properly clean up devices
[project/netifd.git]
/
vlan.c
diff --git
a/vlan.c
b/vlan.c
index
208ff73
..
d00cda0
100644
(file)
--- 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);
if (!up) {
vldev->set_state(dev, false);
system_vlan_del(dev);
-
release_device(vldev->dep.dev
);
+
device_release(&vldev->dep
);
return 0;
}
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)
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;
}
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);
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;