diff options
| author | Ermal <eri@pfsense.org> | 2013-06-17 08:05:47 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2013-06-17 08:06:23 +0000 |
| commit | ca2b90ec7e4cc2c4f2435c3126f74b5e268b43aa (patch) | |
| tree | f96b45991bb37303a2921972545f9dae5baca0cf /etc/inc | |
| parent | d90ea5ffd589f07411b33a7a578ab1d09b700e98 (diff) | |
| download | pfsense-ca2b90ec7e4cc2c4f2435c3126f74b5e268b43aa.zip pfsense-ca2b90ec7e4cc2c4f2435c3126f74b5e268b43aa.tar.gz | |
Do not do the same tricks here that are done on get_real_interface but just call the function directly
Diffstat (limited to 'etc/inc')
| -rw-r--r-- | etc/inc/interfaces.inc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index cd8e205..d10b3b0 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -3658,14 +3658,11 @@ function convert_real_interface_to_friendly_interface_name($interface = "wan") { $ifdescrs = &$config['interfaces']; //$ifdescrs = get_configured_interface_list(false, true); - if (strstr($interface, "_stf")) - $interface = str_replace("_stf", "", $interface); - foreach ($ifdescrs as $if => $ifname) { if ($if == $interface || $config['interfaces'][$if]['if'] == $interface) return $if; - if (stristr($interface, "_wlan0") && $config['interfaces'][$if]['if'] == interface_get_wireless_base($interface)) + if (get_real_interface($if) == $interface) return $if; // XXX: This case doesn't work anymore (segfaults - recursion?) - should be replaced with something else or just removed. |
