mirror of
https://git.kernel.org/pub/scm/network/wireless/iwd.git
synced 2024-12-22 21:22:37 +01:00
main: reordered plugin init/exit
This fixes improper cleanup when ofono leaves the bus after a simauth instance has been cleaned up. The problem was that the plugin exit was being called after the simauth module, causing there to be stale simauth instances that were no longer valid. Now plugins cleanup before simauth. This fix fixes the print seen when iwd exits: "Auth provider queue was not empty on exit!"
This commit is contained in:
parent
8102b33634
commit
ff197edfc4
@ -405,8 +405,6 @@ int main(int argc, char *argv[])
|
|||||||
goto done;
|
goto done;
|
||||||
}
|
}
|
||||||
|
|
||||||
plugin_init(plugins, noplugins);
|
|
||||||
|
|
||||||
genl = l_genl_new_default();
|
genl = l_genl_new_default();
|
||||||
if (!genl) {
|
if (!genl) {
|
||||||
l_error("Failed to open generic netlink socket");
|
l_error("Failed to open generic netlink socket");
|
||||||
@ -447,10 +445,12 @@ int main(int argc, char *argv[])
|
|||||||
known_networks_init();
|
known_networks_init();
|
||||||
rfkill_init();
|
rfkill_init();
|
||||||
sim_auth_init();
|
sim_auth_init();
|
||||||
|
plugin_init(plugins, noplugins);
|
||||||
|
|
||||||
exit_status = EXIT_SUCCESS;
|
exit_status = EXIT_SUCCESS;
|
||||||
l_main_run();
|
l_main_run();
|
||||||
|
|
||||||
|
plugin_exit();
|
||||||
sim_auth_exit();
|
sim_auth_exit();
|
||||||
rfkill_exit();
|
rfkill_exit();
|
||||||
known_networks_exit();
|
known_networks_exit();
|
||||||
@ -469,7 +469,6 @@ fail_device:
|
|||||||
l_genl_unref(genl);
|
l_genl_unref(genl);
|
||||||
|
|
||||||
fail_genl:
|
fail_genl:
|
||||||
plugin_exit();
|
|
||||||
dbus_exit();
|
dbus_exit();
|
||||||
|
|
||||||
done:
|
done:
|
||||||
|
Loading…
Reference in New Issue
Block a user