Revert "Rearrange function calls for wireless to prevent killing hostapd/wpa_supplicant at the wrong time."

This reverts commit e93385d06ddf0e2888b3f5ee5764992a19f99120.

1 files changed, 5 insertions, 6 deletions

diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index 94ca95d..cd7234b 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -1945,6 +1945,9 @@ function interface_wireless_configure($if, &$wl, &$wlcfg) {
 	// Remove script file
 	unlink_if_exists("{$g['tmp_path']}/{$if}_setup.sh");
 
+	// Clone wireless nic if needed.
+	interface_wireless_clone($if, $wl);
+
 	// Reject inadvertent changes to shared settings in case the interface hasn't been configured.
 	interface_sync_wireless_clones($wl, false);
 
@@ -2350,9 +2353,9 @@ function interface_configure($interface = "wan", $reloadall = false, $linkupeven
 			interface_bring_down($interface, true);
 	}
 
-	/* Clone wireless nic if needed. */
+	/* wireless configuration? */
 	if (is_array($wancfg['wireless']))
-		interface_wireless_clone($realif, $wancfg);
+		interface_wireless_configure($realif, $wancfg, $wancfg['wireless']);
 
 	if ($wancfg['spoofmac']) {
 		mwexec("/sbin/ifconfig " . escapeshellarg($realif) .
@@ -2489,10 +2492,6 @@ function interface_configure($interface = "wan", $reloadall = false, $linkupeven
 			break;
 	}
 
-	/* wireless configuration? */
-	if (is_array($wancfg['wireless']))
-		interface_wireless_configure($realif, $wancfg, $wancfg['wireless']);
-
 	if(does_interface_exist($wancfg['if']))
 		interfaces_bring_up($wancfg['if']);