projects
/
project
/
netifd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4bdcb2e
)
always call device_set_disabled, even if the "enabled" attribute is not present
author
Felix Fietkau
<nbd@openwrt.org>
Mon, 23 Jan 2012 13:09:43 +0000
(14:09 +0100)
committer
Felix Fietkau
<nbd@openwrt.org>
Mon, 23 Jan 2012 13:09:43 +0000
(14:09 +0100)
device.c
patch
|
blob
|
history
diff --git
a/device.c
b/device.c
index
84e6528
..
d47bcdf
100644
(file)
--- a/
device.c
+++ b/
device.c
@@
-197,12
+197,11
@@
device_init_settings(struct device *dev, struct blob_attr **tb)
struct device_settings *s = &dev->settings;
struct blob_attr *cur;
struct ether_addr *ea;
struct device_settings *s = &dev->settings;
struct blob_attr *cur;
struct ether_addr *ea;
+ bool disabled = false;
s->flags = 0;
s->flags = 0;
- dev->disabled = false;
-
if ((cur = tb[DEV_ATTR_ENABLED]))
if ((cur = tb[DEV_ATTR_ENABLED]))
- d
evice_set_disabled(dev, !blobmsg_get_bool(cur)
);
+ d
isabled = !blobmsg_get_bool(cur
);
if ((cur = tb[DEV_ATTR_MTU])) {
s->mtu = blobmsg_get_u32(cur);
if ((cur = tb[DEV_ATTR_MTU])) {
s->mtu = blobmsg_get_u32(cur);
@@
-221,6
+220,8
@@
device_init_settings(struct device *dev, struct blob_attr **tb)
s->flags |= DEV_OPT_MACADDR;
}
}
s->flags |= DEV_OPT_MACADDR;
}
}
+
+ device_set_disabled(dev, disabled);
}
static void __init dev_init(void)
}
static void __init dev_init(void)