From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 1 Dec 2013 21:00:28 +0000 (+0100)
Subject: wireless: fix issues with cancelling device setup
X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=commitdiff_plain;h=cc30a45f85a647921bc5eff0ae947c9aa786ce4b

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
--- 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;
@@ -258,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);