summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-12-01 22:00:28 +0100
committerFelix Fietkau <nbd@openwrt.org>2013-12-01 22:00:28 +0100
commitcc30a45f85a647921bc5eff0ae947c9aa786ce4b (patch)
treeb355dd8fbeb08c1c53b2c2bce8bdca3cb574aeb1
parent9507e54cab4e270bff14245ecf2599ad59a5dfac (diff)
wireless: fix issues with cancelling device setup
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
-rw-r--r--wireless.c2
1 files changed, 2 insertions, 0 deletions
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);