Project

General

Profile

« Previous | Next » 

Revision 0a28d385

Added by Erik Fonnesbeck almost 15 years ago

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

This reverts commit e93385d06ddf0e2888b3f5ee5764992a19f99120.

View differences:

etc/inc/interfaces.inc
1945 1945
	// Remove script file
1946 1946
	unlink_if_exists("{$g['tmp_path']}/{$if}_setup.sh");
1947 1947

  
1948
	// Clone wireless nic if needed.
1949
	interface_wireless_clone($if, $wl);
1950

  
1948 1951
	// Reject inadvertent changes to shared settings in case the interface hasn't been configured.
1949 1952
	interface_sync_wireless_clones($wl, false);
1950 1953

  
......
2350 2353
			interface_bring_down($interface, true);
2351 2354
	}
2352 2355

  
2353
	/* Clone wireless nic if needed. */
2356
	/* wireless configuration? */
2354 2357
	if (is_array($wancfg['wireless']))
2355
		interface_wireless_clone($realif, $wancfg);
2358
		interface_wireless_configure($realif, $wancfg, $wancfg['wireless']);
2356 2359

  
2357 2360
	if ($wancfg['spoofmac']) {
2358 2361
		mwexec("/sbin/ifconfig " . escapeshellarg($realif) .
......
2489 2492
			break;
2490 2493
	}
2491 2494

  
2492
	/* wireless configuration? */
2493
	if (is_array($wancfg['wireless']))
2494
		interface_wireless_configure($realif, $wancfg, $wancfg['wireless']);
2495

  
2496 2495
	if(does_interface_exist($wancfg['if']))
2497 2496
		interfaces_bring_up($wancfg['if']);
2498 2497
 	

Also available in: Unified diff