wireless: fix alignment of wireless config structs - fixes segfaults on arm

[project/netifd.git] / wireless.c

diff --git a/wireless.c b/wireless.c
index a4d7c26..5313119 100644 (file)
--- a/wireless.c
+++ b/wireless.c
@@ -180,6 +180,7 @@ wireless_device_free_state(struct wireless_device *wdev)
 {
        struct wireless_interface *vif;
 
+       uloop_timeout_cancel(&wdev->script_check);
        uloop_timeout_cancel(&wdev->timeout);
        wireless_complete_kill_request(wdev);
        free(wdev->data);
@@ -461,10 +462,10 @@ wireless_add_handler(const char *script, const char *name, json_object *obj)
                return;
 
        drv = calloc_a(sizeof(*drv),
-               &name_str, strlen(name) + 1,
-               &script_str, strlen(script) + 1,
                &dev_config, sizeof(*dev_config) + sizeof(void *),
-               &iface_config, sizeof(*iface_config) + sizeof(void *));
+               &iface_config, sizeof(*iface_config) + sizeof(void *),
+               &name_str, strlen(name) + 1,
+               &script_str, strlen(script) + 1);
 
        drv->name = strcpy(name_str, name);
        drv->script = strcpy(script_str, script);
@@ -624,7 +625,6 @@ wireless_device_create(struct wireless_driver *drv, const char *name, struct blo
        INIT_LIST_HEAD(&wdev->script_proc);
        vlist_init(&wdev->interfaces, avl_strcmp, vif_update);
        wdev->interfaces.keep_old = true;
-       wdev->interfaces.no_delete = true;
        vlist_add(&wireless_devices, &wdev->node, wdev->name);
 
        wdev->timeout.cb = wireless_device_setup_timeout;