projects
/
project
/
netifd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
implement a new ubus object "network.device", add a method for dumping detailed devic...
[project/netifd.git]
/
config.c
diff --git
a/config.c
b/config.c
index
c4a6759
..
c8f7807
100644
(file)
--- a/
config.c
+++ b/
config.c
@@
-315,12
+315,10
@@
config_init_package(const char *config)
void
config_init_interfaces(const char *name)
{
void
config_init_interfaces(const char *name)
{
- struct uci_context *ctx;
struct uci_package *p = NULL;
struct uci_element *e;
p = config_init_package("network");
struct uci_package *p = NULL;
struct uci_element *e;
p = config_init_package("network");
- ctx = uci_ctx;
if (!p) {
fprintf(stderr, "Failed to load network config\n");
return;
if (!p) {
fprintf(stderr, "Failed to load network config\n");
return;
@@
-329,6
+327,7
@@
config_init_interfaces(const char *name)
uci_network = p;
config_init = true;
uci_network = p;
config_init = true;
+ device_reset_config();
config_init_devices();
uci_foreach_element(&p->sections, e) {
config_init_devices();
uci_foreach_element(&p->sections, e) {
@@
-340,9
+339,10
@@
config_init_interfaces(const char *name)
if (!strcmp(s->type, "interface"))
config_parse_interface(s);
}
if (!strcmp(s->type, "interface"))
config_parse_interface(s);
}
- device_free_unused(NULL);
config_init = false;
config_init = false;
+ device_reset_old();
device_init_pending();
device_init_pending();
+ device_free_unused(NULL);
interface_start_pending();
}
interface_start_pending();
}