X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=wireless.c;h=c0f3b710fcefff9b50505931ca6a1eb2445262a9;hp=f3c95496864aa39532ca944078a13606c7ca875e;hb=a3bf8cbe10b0bad85475f4c3dc2bae4afb65774b;hpb=f96536b6e6a453545b92cb1dda8c6bb420a371a7

diff --git a/wireless.c b/wireless.c
index f3c9549..c0f3b71 100644
--- a/wireless.c
+++ b/wireless.c
@@ -202,6 +202,12 @@ static void wireless_interface_handle_link(struct wireless_interface *vif, bool
 	if (!vif->network || !vif->ifname)
 		return;
 
+	if (up) {
+		struct device *dev = device_get(vif->ifname, 2);
+		if (dev)
+			dev->wireless = true;
+	}
+
 	blobmsg_for_each_attr(cur, vif->network, rem) {
 		network = blobmsg_data(cur);
 
@@ -317,17 +323,6 @@ wireless_device_mark_down(struct wireless_device *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)
 {
 	struct wireless_device *wdev = container_of(timeout, struct wireless_device, timeout);
@@ -361,6 +356,23 @@ __wireless_device_set_down(struct wireless_device *wdev)
 }
 
 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)
 {
 	if (wdev->state == IFS_TEARDOWN || wdev->state == IFS_DOWN || wdev->cancel)
@@ -897,9 +909,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: