main: Stop rfkill after the plugins

In order to catch rfkill device deletion and to propagate those events
to the technology layer properly.

2 files changed, 2 insertions, 4 deletions

diff --git a/src/element.c b/src/element.c
index a4230b7c..27631ea7 100644
--- a/src/element.c
+++ b/src/element.c
@@ -1400,16 +1400,12 @@ 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 6cdf59e8..13a7af11 100644
--- a/src/main.c
+++ b/src/main.c
@@ -232,6 +232,7 @@ 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);
 
@@ -253,6 +254,7 @@ int main(int argc, char *argv[])
 
 	__connman_plugin_cleanup();
 
+	__connman_rfkill_cleanup();
 	__connman_timeserver_cleanup();
 	__connman_session_cleanup();
 	__connman_detect_cleanup();