wireless: fix issues with cancelling device setup

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

diff --git a/wireless.c b/wireless.c
index c099a33..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;
 
 {
        struct wireless_interface *vif;
 

+       uloop_timeout_cancel(&wdev->timeout);

        wireless_complete_kill_request(wdev);
        free(wdev->data);
        wdev->data = NULL;
        wireless_complete_kill_request(wdev);
        free(wdev->data);
        wdev->data = NULL;


@@ -258,6 +259,7 @@ wireless_device_mark_down(struct wireless_device *wdev)
 
        wireless_process_kill_all(wdev, SIGTERM, true);
 
 
        wireless_process_kill_all(wdev, SIGTERM, true);
 

+       wdev->cancel = false;

        wdev->state = IFS_DOWN;
        wireless_device_free_state(wdev);
 
        wdev->state = IFS_DOWN;
        wireless_device_free_state(wdev);