Revert "main: Stop rfkill after the plugins"

This reverts commit b2a4246439738b5e9a262da77d56d99d348da36a.

diff --git a/src/element.c b/src/element.c
index 27631ea..a4230b7 100644 (file)
--- a/src/element.c
+++ b/src/element.c
@@ -1400,12 +1400,16 @@ void __connman_element_start(void)
        __connman_dhcp_init();
        __connman_wpad_init();
        __connman_wispr_init();
+
+       __connman_rfkill_init();
 }
 
 void __connman_element_stop(void)
 {
        DBG("");
 
+       __connman_rfkill_cleanup();
+
        __connman_wispr_cleanup();
        __connman_wpad_cleanup();
        __connman_dhcp_cleanup();

diff --git a/src/main.c b/src/main.c
index 13a7af1..6cdf59e 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -232,7 +232,6 @@ int main(int argc, char *argv[])
        __connman_detect_init();
        __connman_session_init();
        __connman_timeserver_init();
-       __connman_rfkill_init();
 
        __connman_plugin_init(option_plugin, option_noplugin);
 
@@ -254,7 +253,6 @@ int main(int argc, char *argv[])
 
        __connman_plugin_cleanup();
 
-       __connman_rfkill_cleanup();
        __connman_timeserver_cleanup();
        __connman_session_cleanup();
        __connman_detect_cleanup();