Project

General

Profile

« Previous | Next » 

Revision ca2b90ec

Added by Ermal LUÇI about 12 years ago

Do not do the same tricks here that are done on get_real_interface but just call the function directly

View differences:

etc/inc/interfaces.inc
3658 3658
	$ifdescrs = &$config['interfaces'];
3659 3659
	//$ifdescrs = get_configured_interface_list(false, true);
3660 3660

  
3661
	if (strstr($interface, "_stf"))
3662
		$interface = str_replace("_stf", "", $interface);
3663

  
3664 3661
	foreach ($ifdescrs as $if => $ifname) {
3665 3662
		if ($if == $interface || $config['interfaces'][$if]['if'] == $interface)
3666 3663
			return $if;
3667 3664

  
3668
		if (stristr($interface, "_wlan0") && $config['interfaces'][$if]['if'] == interface_get_wireless_base($interface))
3665
		if (get_real_interface($if) == $interface)
3669 3666
			return $if;
3670 3667

  
3671 3668
		// XXX: This case doesn't work anymore (segfaults - recursion?) - should be replaced with something else or just removed.

Also available in: Unified diff