Skip to content

Commit

Permalink
[usb-moded] Fix network settings disappearing on a config file merge.…
Browse files Browse the repository at this point in the history
… Fixes: JB#10917

There was a mistake in setting the network configuration. Set_network_settings takes
the config option first, then the value to be set.

Signed-off-by: Philippe De Swert <philippe.deswert@jollamobile.com>
  • Loading branch information
philippedeswert committed Oct 25, 2013
1 parent bc0421a commit 42b3a2c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/usb_moded-config.c
Expand Up @@ -527,9 +527,9 @@ int conf_file_merge(void)
if( get_conf_string(NETWORK_ENTRY, NETWORK_IP_KEY))
goto cleanup;
if(ip)
set_network_setting(ip, NETWORK_IP_KEY);
set_network_setting(NETWORK_IP_KEY, ip);
if(gateway)
set_network_setting(gateway, NETWORK_GATEWAY_KEY);
set_network_setting(NETWORK_GATEWAY_KEY, gateway);

#endif /* UDEV */
}
Expand Down

0 comments on commit 42b3a2c

Please sign in to comment.