wireless: fix issues with cancelling device setup

[project/netifd.git] / wireless.c

diff --git a/wireless.c b/wireless.c
index 7d61a61..c19d12c 100644 (file)
--- a/wireless.c
+++ b/wireless.c
@@ -167,6 +167,7 @@ wireless_device_free_state(struct wireless_device *wdev)
 {
        struct wireless_interface *vif;
 
+       uloop_timeout_cancel(&wdev->timeout);
        wireless_complete_kill_request(wdev);
        free(wdev->data);
        wdev->data = NULL;
@@ -197,6 +198,7 @@ wireless_device_setup_cancel(struct wireless_device *wdev)
        if (wdev->cancel)
                return;
 
+       D(WIRELESS, "Cancel wireless device '%s' setup\n", wdev->name);
        wdev->cancel = true;
        uloop_timeout_set(&wdev->timeout, 10 * 1000);
 }
@@ -257,6 +259,7 @@ wireless_device_mark_down(struct wireless_device *wdev)
 
        wireless_process_kill_all(wdev, SIGTERM, true);
 
+       wdev->cancel = false;
        wdev->state = IFS_DOWN;
        wireless_device_free_state(wdev);