projects
/
project
/
netifd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netifd: Fix restore of original device settings
[project/netifd.git]
/
interface.c
diff --git
a/interface.c
b/interface.c
index
35f20b0
..
733b5f1
100644
(file)
--- a/
interface.c
+++ b/
interface.c
@@
-501,6
+501,8
@@
interface_claim_device(struct interface *iface)
} else if (iface->ifname &&
!(iface->proto_handler->flags & PROTO_FLAG_NODEV)) {
dev = device_get(iface->ifname, true);
} else if (iface->ifname &&
!(iface->proto_handler->flags & PROTO_FLAG_NODEV)) {
dev = device_get(iface->ifname, true);
+ if (dev && dev->default_config && iface->device_config)
+ device_set_config(dev, dev->type, iface->config);
} else {
dev = iface->ext_dev.dev;
}
} else {
dev = iface->ext_dev.dev;
}
@@
-881,8
+883,8
@@
interface_handle_link(struct interface *iface, const char *name, bool add, bool
if (add) {
device_set_present(dev, true);
if (add) {
device_set_present(dev, true);
- if (iface->device_config)
- device_set_config(dev,
&simple_device_
type, iface->config);
+ if (iface->device_config
&& dev->default_config
)
+ device_set_config(dev,
dev->
type, iface->config);
system_if_apply_settings(dev, &dev->settings, dev->settings.flags);
ret = interface_add_link(iface, dev, link_ext);
system_if_apply_settings(dev, &dev->settings, dev->settings.flags);
ret = interface_add_link(iface, dev, link_ext);
@@
-1043,10
+1045,13
@@
interface_change_config(struct interface *if_old, struct interface *if_new)
}
if (reload_ip) {
}
if (reload_ip) {
+ bool config_ip_enabled = if_old->config_ip.enabled;
+ bool proto_ip_enabled = if_old->proto_ip.enabled;
+
interface_ip_set_enabled(&if_old->config_ip, false);
interface_ip_set_enabled(&if_old->proto_ip, false);
interface_ip_set_enabled(&if_old->config_ip, false);
interface_ip_set_enabled(&if_old->proto_ip, false);
- interface_ip_set_enabled(&if_old->proto_ip,
if_new->proto_ip.
enabled);
- interface_ip_set_enabled(&if_old->config_ip,
if_new->config_ip.
enabled);
+ interface_ip_set_enabled(&if_old->proto_ip,
proto_ip_
enabled);
+ interface_ip_set_enabled(&if_old->config_ip,
config_ip_
enabled);
}
interface_write_resolv_conf();
}
interface_write_resolv_conf();