X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=wireless.c;h=508d35e4e7b9def434b4b0dc2c820a33ec87a2cc;hp=7d61a6108f5414c9c2e9549356bc83d8288a0946;hb=465efe77b06ce9bab1935395a64f1a441f5f3c89;hpb=be057fe138aef1f38d615e4751da078aa6ce36ed

diff --git a/wireless.c b/wireless.c
index 7d61a61..508d35e 100644
--- a/wireless.c
+++ b/wireless.c
@@ -76,6 +76,9 @@ vif_config_add_bridge(struct blob_buf *buf, const char *network, bool prepare)
 	if (dev->type != &bridge_device_type)
 		return;
 
+	if (dev->hotplug_ops && dev->hotplug_ops->prepare)
+		dev->hotplug_ops->prepare(dev);
+
 	blobmsg_add_string(buf, "bridge", dev->ifname);
 }
 
@@ -167,6 +170,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;
@@ -197,6 +201,7 @@ wireless_device_setup_cancel(struct wireless_device *wdev)
 	if (wdev->cancel)
 		return;
 
+	D(WIRELESS, "Cancel wireless device '%s' setup\n", wdev->name);
 	wdev->cancel = true;
 	uloop_timeout_set(&wdev->timeout, 10 * 1000);
 }
@@ -246,6 +251,32 @@ __wireless_device_set_up(struct wireless_device *wdev)
 }
 
 static void
+wireless_device_free(struct wireless_device *wdev)
+{
+    vlist_flush_all(&wdev->interfaces);
+    free(wdev->config);
+    free(wdev);
+}
+
+static void
+wdev_handle_config_change(struct wireless_device *wdev)
+{
+	enum interface_config_state state = wdev->config_state;
+
+	wdev->config_state = IFC_NORMAL;
+	switch(state) {
+	case IFC_NORMAL:
+	case IFC_RELOAD:
+		if (wdev->autostart)
+			__wireless_device_set_up(wdev);
+		break;
+	case IFC_REMOVE:
+		wireless_device_free(wdev);
+		break;
+	}
+}
+
+static void
 wireless_device_mark_down(struct wireless_device *wdev)
 {
 	struct wireless_interface *vif;
@@ -257,11 +288,10 @@ 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);
-
-	if (wdev->autostart)
-		__wireless_device_set_up(wdev);
+	wdev_handle_config_change(wdev);
 }
 
 static void
@@ -311,6 +341,9 @@ __wireless_device_set_down(struct wireless_device *wdev)
 static void
 wireless_device_retry_setup(struct wireless_device *wdev)
 {
+	if (wdev->state == IFS_TEARDOWN || wdev->state == IFS_DOWN || wdev->cancel)
+		return;
+
 	if (--wdev->retry < 0)
 		wdev->autostart = false;
 
@@ -342,33 +375,6 @@ wireless_device_set_down(struct wireless_device *wdev)
 }
 
 static void
-wireless_device_free(struct wireless_device *wdev)
-{
-    vlist_flush_all(&wdev->interfaces);
-    free(wdev->config);
-    free(wdev);
-}
-
-static void
-wdev_handle_config_change(struct wireless_device *wdev)
-{
-	enum interface_config_state state = wdev->config_state;
-
-	wdev->config_state = IFC_NORMAL;
-	switch(state) {
-	case IFC_NORMAL:
-		break;
-	case IFC_RELOAD:
-		if (wdev->autostart)
-			__wireless_device_set_up(wdev);
-		break;
-	case IFC_REMOVE:
-		wireless_device_free(wdev);
-		break;
-	}
-}
-
-static void
 wdev_set_config_state(struct wireless_device *wdev, enum interface_config_state s)
 {
 	enum interface_config_state old_state = wdev->config_state;
@@ -645,7 +651,7 @@ wireless_interface_status(struct wireless_interface *iface, struct blob_buf *b)
 {
 	void *i;
 
-	i = blobmsg_open_table(b, iface->name);
+	i = blobmsg_open_table(b, NULL);
 	if (iface->section)
 		blobmsg_add_string(b, "section", iface->section);
 	if (iface->ifname)
@@ -665,10 +671,10 @@ wireless_device_status(struct wireless_device *wdev, struct blob_buf *b)
 	blobmsg_add_u8(b, "up", wdev->state == IFS_UP);
 	blobmsg_add_u8(b, "pending", wdev->state == IFS_SETUP || wdev->state == IFS_TEARDOWN);
 	blobmsg_add_u8(b, "autostart", wdev->autostart);
-	i = blobmsg_open_table(b, "interfaces");
+	i = blobmsg_open_array(b, "interfaces");
 	vlist_for_each_element(&wdev->interfaces, iface, node)
 		wireless_interface_status(iface, b);
-	blobmsg_close_table(b, i);
+	blobmsg_close_array(b, i);
 	blobmsg_close_table(b, c);
 }