diff options
author | Felix Fietkau <nbd@openwrt.org> | 2014-03-07 18:49:43 +0100 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2014-03-07 18:49:43 +0100 |
commit | a565ae60a2fd6aea1fb64a8a3728d101ab2357c3 (patch) | |
tree | 6e2d13dbc9bde4b4c0336bd7da5fe0840f419344 | |
parent | 4d1a597f65bbb49aa843112812d5ca929478c706 (diff) |
wireless: defer init until after command line option processing
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
-rw-r--r-- | main.c | 3 | ||||
-rw-r--r-- | wireless.c | 3 | ||||
-rw-r--r-- | wireless.h | 1 |
3 files changed, 5 insertions, 2 deletions
@@ -24,6 +24,7 @@ #include "config.h" #include "system.h" #include "interface.h" +#include "wireless.h" unsigned int debug_mask = 0; const char *main_path = DEFAULT_MAIN_PATH; @@ -325,6 +326,8 @@ int main(int argc, char **argv) return 1; } + wireless_init(); + if (system_init()) { fprintf(stderr, "Failed to initialize system control\n"); return 1; @@ -491,8 +491,7 @@ wireless_add_handler(const char *script, const char *name, json_object *obj) D(WIRELESS, "Add handler for script %s: %s\n", script, name); } -static void __init -wireless_init_list(void) +void wireless_init(void) { vlist_init(&wireless_devices, avl_strcmp, wdev_update); wireless_devices.keep_old = true; @@ -97,5 +97,6 @@ int wireless_device_notify(struct wireless_device *wdev, struct blob_attr *data, struct ubus_request_data *req); void wireless_start_pending(void); +void wireless_init(void); #endif |