summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2011-04-22 14:44:46 +0200
committerMarcel Holtmann <marcel@holtmann.org>2011-10-20 23:54:00 -0700
commit803eb22cf2a2600cc956cf2e5806acdfec590e14 (patch)
tree317489e916050aad18a4aaf1b236cd7bcb02b8d4
parent14eaafacd86b6b057286c7110560a8281b1681d0 (diff)
downloadneard-803eb22cf2a2600cc956cf2e5806acdfec590e14.tar.gz
neard-803eb22cf2a2600cc956cf2e5806acdfec590e14.tar.bz2
neard-803eb22cf2a2600cc956cf2e5806acdfec590e14.zip
main: Change module initialization order
netlink and adapter needs to be started before manager.
-rw-r--r--src/main.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main.c b/src/main.c
index aee3a4f..da89a88 100644
--- a/src/main.c
+++ b/src/main.c
@@ -136,9 +136,9 @@ int main(int argc, char *argv[])
__near_log_init(option_debug, option_detach);
__near_dbus_init(conn);
- __near_manager_init(conn);
- __near_adapter_init();
__near_netlink_init();
+ __near_adapter_init();
+ __near_manager_init(conn);
memset(&sa, 0, sizeof(sa));
sa.sa_handler = sig_term;
@@ -147,9 +147,9 @@ int main(int argc, char *argv[])
g_main_loop_run(main_loop);
- __near_netlink_cleanup();
- __near_adapter_cleanup();
__near_manager_cleanup();
+ __near_adapter_cleanup();
+ __near_netlink_cleanup();
__near_dbus_cleanup();
__near_log_cleanup();