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:
9bebe7d
)
fix device reload with no previous config
author
Felix Fietkau
<nbd@openwrt.org>
Mon, 3 Oct 2011 01:11:30 +0000
(
03:11
+0200)
committer
Felix Fietkau
<nbd@openwrt.org>
Mon, 3 Oct 2011 01:11:30 +0000
(
03:11
+0200)
device.c
patch
|
blob
|
history
diff --git
a/device.c
b/device.c
index
caadbc3
..
ab8ff91
100644
(file)
--- a/
device.c
+++ b/
device.c
@@
-305,8
+305,11
@@
device_reload_config(struct device *dev, struct blob_attr *attr)
blobmsg_parse(dev_attrs, __DEV_ATTR_MAX, tb,
blob_data(attr), blob_len(attr));
blobmsg_parse(dev_attrs, __DEV_ATTR_MAX, tb,
blob_data(attr), blob_len(attr));
- blobmsg_parse(dev_attrs, __DEV_ATTR_MAX, tb1,
- blob_data(dev->config), blob_len(dev->config));
+ if (dev->config)
+ blobmsg_parse(dev_attrs, __DEV_ATTR_MAX, tb1,
+ blob_data(dev->config), blob_len(dev->config));
+ else
+ memset(tb1, 0, sizeof(tb1));
if (!config_diff(tb, tb1, &device_attr_list, NULL))
return DEV_CONFIG_NO_CHANGE;
if (!config_diff(tb, tb1, &device_attr_list, NULL))
return DEV_CONFIG_NO_CHANGE;