[OpenWrt-Devel] [PATCH 3/3] netifd: Set interface device config when device has old settings

[Hans Dedecker]

On Fri, Feb 13, 2015 at 2:57 AM, Felix Fietkau <nbd at openwrt.org> wrote:
> On 2015-02-13 03:41, Hans Dedecker wrote:
>> 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 at gmail.com>
>> ---
>>  config.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/config.c b/config.c
>> index 34d2f2b..9108ab4 100644
>> --- 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 (iface->device_config)
>> +     if (iface->device_config || dev->settings.flags)
>>               device_set_config(dev, dev->type, b.head);
> Wouldn't that overwrite device config added via 'config device' sections?
>
> - Felix
Hi Felix,

Function config_parse_interface checks default_config for a given
device; if set to false the interface device config logic is skipped.
As default_config is set to false in function config_init_devices when
parsing the config device sections;
an overwrite of the device config section data is avoided in this case.

Hans
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel