diff options
| author | Erik Fonnesbeck <efonnes@gmail.com> | 2010-08-02 01:52:18 -0600 |
|---|---|---|
| committer | Erik Fonnesbeck <efonnes@gmail.com> | 2010-08-02 01:52:18 -0600 |
| commit | af637766c12cc73913d260bf5e3336cead2d5326 (patch) | |
| tree | 530d2b241dbd8adb536d6bc00b317751d0197938 /etc/inc/interfaces.inc | |
| parent | 0e1619be29e1875404e5c24b94b64d0e6d516c39 (diff) | |
| download | pfsense-af637766c12cc73913d260bf5e3336cead2d5326.zip pfsense-af637766c12cc73913d260bf5e3336cead2d5326.tar.gz | |
Make convert_real_interface_to_friendly_interface_name recognize that the parent wireless name in the config means the same as the #0 clone. Fixes a bug in is_interface_wireless that could cause it to create a blank interface entry.
Diffstat (limited to 'etc/inc/interfaces.inc')
| -rw-r--r-- | etc/inc/interfaces.inc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 8a0db7d..a4c0bf6 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -2553,6 +2553,9 @@ function convert_real_interface_to_friendly_interface_name($interface = "wan") { if ($config['interfaces'][$if]['if'] == $interface) return $if; + if (stristr($interface, "_wlan0") && $config['interfaces'][$if]['if'] == interface_get_wireless_base($interface)) + return $if; + /* XXX: ermal - The 3 lines below are totally bogus code. */ $int = interface_translate_type_to_real($if); if ($int == $interface) |
