diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-03-03 20:55:03 +0100 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-03-03 20:55:03 +0100 |
| commit | f5f78c1eca1fe2df04dae56a4d9f024533066b29 (patch) | |
| tree | d224a80554f4ee56a9a4db6547ba808de2d0e494 /interface.c | |
| parent | aff73720b65ca33a487c813f27644f8d5aea0df1 (diff) | |
preserve interface main hotplug device on reload
Diffstat (limited to 'interface.c')
| -rw-r--r-- | interface.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/interface.c b/interface.c index 2404878..6e3feeb 100644 --- a/interface.c +++ b/interface.c @@ -195,7 +195,7 @@ interface_claim_device(struct interface *iface) static void -interface_cleanup(struct interface *iface) +interface_cleanup(struct interface *iface, bool reload) { struct interface_user *dep, *tmp; @@ -205,7 +205,8 @@ interface_cleanup(struct interface *iface) interface_ip_flush(&iface->config_ip); interface_flush_state(iface); interface_clear_errors(iface); - if (iface->main_dev.dev) + if (iface->main_dev.dev && + (!reload || !iface->main_dev.hotplug)) device_remove_user(&iface->main_dev); iface->l3_dev = &iface->main_dev; interface_set_proto_state(iface, NULL); @@ -214,7 +215,7 @@ interface_cleanup(struct interface *iface) static void interface_do_free(struct interface *iface) { - interface_cleanup(iface); + interface_cleanup(iface, false); free(iface->config); netifd_ubus_remove_interface(iface); avl_delete(&interfaces.avl, &iface->node.avl); @@ -224,7 +225,7 @@ interface_do_free(struct interface *iface) static void interface_do_reload(struct interface *iface) { - interface_cleanup(iface); + interface_cleanup(iface, true); proto_init_interface(iface, iface->config); interface_claim_device(iface); } |