projects
/
project
/
netifd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ubus: split address from mask in interface status
[project/netifd.git]
/
device.c
diff --git
a/device.c
b/device.c
index
ab9138b
..
0560a70
100644
(file)
--- a/
device.c
+++ b/
device.c
@@
-112,7
+112,6
@@
static void simple_device_free(struct device *dev)
{
if (dev->parent.dev)
device_remove_user(&dev->parent);
{
if (dev->parent.dev)
device_remove_user(&dev->parent);
- device_cleanup(dev);
free(dev);
}
free(dev);
}
@@
-162,8
+161,6
@@
static void alias_device_free(struct device *dev)
{
struct alias_device *alias;
{
struct alias_device *alias;
- device_cleanup(dev);
-
alias = container_of(dev, struct alias_device, dev);
avl_delete(&aliases, &alias->avl);
free(alias);
alias = container_of(dev, struct alias_device, dev);
avl_delete(&aliases, &alias->avl);
free(alias);
@@
-469,6
+466,9
@@
void device_add_user(struct device_user *dep, struct device *dev)
if (dep->dev)
device_remove_user(dep);
if (dep->dev)
device_remove_user(dep);
+ if (!dev)
+ return;
+
dep->dev = dev;
list_add_tail(&dep->list, &dev->users);
if (dep->cb && dev->present) {
dep->dev = dev;
list_add_tail(&dep->list, &dev->users);
if (dep->cb && dev->present) {
@@
-482,6
+482,8
@@
void
device_free(struct device *dev)
{
__devlock++;
device_free(struct device *dev)
{
__devlock++;
+ free(dev->config);
+ device_cleanup(dev);
dev->type->free(dev);
__devlock--;
}
dev->type->free(dev);
__devlock--;
}
@@
-554,7
+556,7
@@
device_reload_config(struct device *dev, struct blob_attr *attr)
blob_data(attr), blob_len(attr));
device_init_settings(dev, tb);
blob_data(attr), blob_len(attr));
device_init_settings(dev, tb);
- return DEV_CONFIG_
APPLIED
;
+ return DEV_CONFIG_
RESTART
;
} else
return DEV_CONFIG_RECREATE;
}
} else
return DEV_CONFIG_RECREATE;
}
@@
-634,11
+636,12
@@
device_create(const char *name, const struct device_type *type,
odev->current_config = true;
change = device_set_config(odev, type, config);
switch (change) {
odev->current_config = true;
change = device_set_config(odev, type, config);
switch (change) {
+ case DEV_CONFIG_RESTART:
case DEV_CONFIG_APPLIED:
D(DEVICE, "Device '%s': config applied\n", odev->ifname);
free(odev->config);
odev->config = config;
case DEV_CONFIG_APPLIED:
D(DEVICE, "Device '%s': config applied\n", odev->ifname);
free(odev->config);
odev->config = config;
- if (odev->present) {
+ if (
change == DEV_CONFIG_RESTART &&
odev->present) {
device_set_present(odev, false);
device_set_present(odev, true);
}
device_set_present(odev, false);
device_set_present(odev, true);
}