summaryrefslogtreecommitdiff
path: root/wireless.c
diff options
context:
space:
mode:
authorJohn Crispin <john@phrozen.org>2019-10-25 14:02:03 +0200
committerDaniel Golle <daniel@makrotopia.org>2019-10-25 14:07:01 +0200
commit7a723d0c797d28823f3d0eae9c72aca3ae69d976 (patch)
tree9d4e99060da054dac84dbe8215f000979ce395f1 /wireless.c
parent5e02f94411b06f192fb2a7d9be9abde3549153a8 (diff)
downloadnetifd-7a723d0c797d28823f3d0eae9c72aca3ae69d976.tar.gz
wireless: add ubus method for reloading configuration
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'wireless.c')
-rw-r--r--wireless.c18
1 files changed, 13 insertions, 5 deletions
diff --git a/wireless.c b/wireless.c
index 387f4ba..9986e9a 100644
--- a/wireless.c
+++ b/wireless.c
@@ -282,7 +282,7 @@ wireless_device_run_handler(struct wireless_device *wdev, bool up)
}
static void
-__wireless_device_set_up(struct wireless_device *wdev)
+__wireless_device_set_up(struct wireless_device *wdev, int force)
{
if (wdev->disabled)
return;
@@ -293,7 +293,7 @@ __wireless_device_set_up(struct wireless_device *wdev)
if (!wdev->autostart)
return;
- if (wdev->state != IFS_DOWN || config_init)
+ if (!force && (wdev->state != IFS_DOWN || config_init))
return;
free(wdev->prev_config);
@@ -320,7 +320,7 @@ wdev_handle_config_change(struct wireless_device *wdev)
switch(state) {
case IFC_NORMAL:
case IFC_RELOAD:
- __wireless_device_set_up(wdev);
+ __wireless_device_set_up(wdev, 0);
wdev->config_state = IFC_NORMAL;
break;
@@ -363,7 +363,15 @@ wireless_device_set_up(struct wireless_device *wdev)
{
wdev->retry = WIRELESS_SETUP_RETRY;
wdev->autostart = true;
- __wireless_device_set_up(wdev);
+ __wireless_device_set_up(wdev, 0);
+}
+
+void
+wireless_device_reconf(struct wireless_device *wdev)
+{
+ wdev->retry = WIRELESS_SETUP_RETRY;
+ wdev->autostart = true;
+ __wireless_device_set_up(wdev, 1);
}
static void
@@ -1001,5 +1009,5 @@ wireless_start_pending(void)
struct wireless_device *wdev;
vlist_for_each_element(&wireless_devices, wdev, node)
- __wireless_device_set_up(wdev);
+ __wireless_device_set_up(wdev, 0);
}