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);
if (!iface)
continue;
- interface_handle_link(iface, vif->ifname, up);
+ interface_handle_link(iface, vif->ifname, up, true);
}
}
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)
{
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)
{
D(WIRELESS, "Add handler for script %s: %s\n", script, name);
}
-static void __init
-wireless_init_list(void)
+void wireless_init(void)
{
vlist_init(&wireless_devices, avl_strcmp, wdev_update);
wireless_devices.keep_old = true;
INIT_LIST_HEAD(&wdev->script_proc);
vlist_init(&wdev->interfaces, avl_strcmp, vif_update);
wdev->interfaces.keep_old = true;
- vlist_add(&wireless_devices, &wdev->node, wdev->name);
wdev->timeout.cb = wireless_device_setup_timeout;
wdev->script_task.cb = wireless_device_script_task_cb;
wdev->script_proc_fd.cb = wireless_proc_poll_fd;
wdev->script_check.cb = wireless_device_check_script_tasks;
+
+ vlist_add(&wireless_devices, &wdev->node, wdev->name);
}
void wireless_interface_create(struct wireless_device *wdev, struct blob_attr *data, const char *section)
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: