projects
/
project
/
netifd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vlist: add a special node version -1 for nodes that should not be flushed on updates
[project/netifd.git]
/
device.c
diff --git
a/device.c
b/device.c
index
d47bcdf
..
ab9138b
100644
(file)
--- a/
device.c
+++ b/
device.c
@@
-214,7
+214,7
@@
device_init_settings(struct device *dev, struct blob_attr **tb)
}
if ((cur = tb[DEV_ATTR_MACADDR])) {
}
if ((cur = tb[DEV_ATTR_MACADDR])) {
- ea = ether_aton(blob_data(cur));
+ ea = ether_aton(blob
msg
_data(cur));
if (ea) {
memcpy(s->macaddr, ea, 6);
s->flags |= DEV_OPT_MACADDR;
if (ea) {
memcpy(s->macaddr, ea, 6);
s->flags |= DEV_OPT_MACADDR;
@@
-312,7
+312,8
@@
void device_release(struct device_user *dep)
return;
device_broadcast_event(dev, DEV_EVENT_TEARDOWN);
return;
device_broadcast_event(dev, DEV_EVENT_TEARDOWN);
- dev->set_state(dev, false);
+ if (!dep->hotplug)
+ dev->set_state(dev, false);
device_broadcast_event(dev, DEV_EVENT_DOWN);
}
device_broadcast_event(dev, DEV_EVENT_DOWN);
}
@@
-465,6
+466,9
@@
device_set_disabled(struct device *dev, bool value)
void device_add_user(struct device_user *dep, struct device *dev)
{
void device_add_user(struct device_user *dep, struct device *dev)
{
+ if (dep->dev)
+ device_remove_user(dep);
+
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) {