wireless: fix cancelling setup

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

diff --git a/wireless.c b/wireless.c
index f3c95496864aa39532ca944078a13606c7ca875e..0e293a0783d189581855737d4ec117f7e8679285 100644 (file)
--- a/wireless.c
+++ b/wireless.c
@@ -316,17 +316,6 @@ wireless_device_mark_down(struct wireless_device *wdev)
        wdev_handle_config_change(wdev);
 }
 
-static void
-wireless_device_mark_up(struct wireless_device *wdev)
-{
-       struct wireless_interface *vif;
-
-       D(WIRELESS, "Wireless device '%s' is now up\n", wdev->name);
-       wdev->state = IFS_UP;
-       vlist_for_each_element(&wdev->interfaces, vif, node)
-               wireless_interface_handle_link(vif, true);
-}
-
 static void
 wireless_device_setup_timeout(struct uloop_timeout *timeout)
 {
@@ -360,6 +349,23 @@ __wireless_device_set_down(struct wireless_device *wdev)
        wireless_device_run_handler(wdev, false);
 }
 
+static void
+wireless_device_mark_up(struct wireless_device *wdev)
+{
+       struct wireless_interface *vif;
+
+       if (wdev->cancel) {
+               wdev->cancel = false;
+               __wireless_device_set_down(wdev);
+               return;
+       }
+
+       D(WIRELESS, "Wireless device '%s' is now up\n", wdev->name);
+       wdev->state = IFS_UP;
+       vlist_for_each_element(&wdev->interfaces, vif, node)
+               wireless_interface_handle_link(vif, true);
+}
+
 static void
 wireless_device_retry_setup(struct wireless_device *wdev)
 {
@@ -897,9 +903,6 @@ wireless_device_notify(struct wireless_device *wdev, struct blob_attr *data,
                if (wdev->state != IFS_SETUP)
                        return UBUS_STATUS_PERMISSION_DENIED;
 
-               if (wdev->cancel)
-                       return 0;
-
                wireless_device_mark_up(wdev);
                break;
        case NOTIFY_CMD_SET_DATA: