X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=wireless.c;h=0fd209e57867a325bb7967348a050bf9033f984e;hp=34603372903b14ea12c88236ce111587ccdac2fc;hb=a9b361becf7b8668247602403f870ad9503fd8e9;hpb=c317cccbef29bc4ec441ee89778f763618c5b4b4

diff --git a/wireless.c b/wireless.c
index 3460337..0fd209e 100644
--- a/wireless.c
+++ b/wireless.c
@@ -180,6 +180,7 @@ wireless_device_free_state(struct wireless_device *wdev)
 {
 	struct wireless_interface *vif;
 
+	uloop_timeout_cancel(&wdev->script_check);
 	uloop_timeout_cancel(&wdev->timeout);
 	wireless_complete_kill_request(wdev);
 	free(wdev->data);
@@ -281,10 +282,10 @@ 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:
+		wdev->config_state = IFC_NORMAL;
 		if (wdev->autostart)
 			__wireless_device_set_up(wdev);
 		break;
@@ -395,12 +396,10 @@ wireless_device_set_down(struct wireless_device *wdev)
 static void
 wdev_set_config_state(struct wireless_device *wdev, enum interface_config_state s)
 {
-	enum interface_config_state old_state = wdev->config_state;
-
-	wdev->config_state = s;
-	if (old_state != IFC_NORMAL)
+	if (wdev->config_state != IFC_NORMAL)
 		return;
 
+	wdev->config_state = s;
 	if (wdev->state == IFS_DOWN)
 		wdev_handle_config_change(wdev);
 	else
@@ -626,7 +625,6 @@ wireless_device_create(struct wireless_driver *drv, const char *name, struct blo
 	INIT_LIST_HEAD(&wdev->script_proc);
 	vlist_init(&wdev->interfaces, avl_strcmp, vif_update);
 	wdev->interfaces.keep_old = true;
-	wdev->interfaces.no_delete = true;
 	vlist_add(&wireless_devices, &wdev->node, wdev->name);
 
 	wdev->timeout.cb = wireless_device_setup_timeout;