netifd: Set interface device config when device has old settings
authorHans Dedecker <dedeckeh@gmail.com>
Thu, 12 Feb 2015 16:41:17 +0000 (17:41 +0100)
committerSteven Barth <steven@midlink.org>
Tue, 17 Feb 2015 14:12:05 +0000 (15:12 +0100)
If interface device settings are removed in UCI they were not removed in the
device settings; calling device_set_config when device settings are present
solves this.

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
config.c

index fa47b94..b0607dd 100644 (file)
--- a/config.c
+++ b/config.c
@@ -136,7 +136,7 @@ config_parse_interface(struct uci_section *s, bool alias)
        if (blob_len(b.head) == 0)
                return;
 
        if (blob_len(b.head) == 0)
                return;
 
-       if (iface->device_config)
+       if (iface->device_config || dev->settings.flags)
                device_set_config(dev, dev->type, b.head);
        return;
 error_free_config:
                device_set_config(dev, dev->type, b.head);
        return;
 error_free_config: