diff options
author | Erik Fonnesbeck <efonnes@gmail.com> | 2010-02-23 02:12:50 -0700 |
---|---|---|
committer | Erik Fonnesbeck <efonnes@gmail.com> | 2010-02-23 02:12:50 -0700 |
commit | 34808d4ef99704030ce6d4bf5963a47fab46fc9e (patch) | |
tree | bda4d3d72ae571649b959743bb49f72af82d7b4e /etc/inc/util.inc | |
parent | 4a5e1d557942294f24d4d299a70c5937803bac30 (diff) | |
download | pfsense-34808d4ef99704030ce6d4bf5963a47fab46fc9e.zip pfsense-34808d4ef99704030ce6d4bf5963a47fab46fc9e.tar.gz |
Move most of the code for dealing with wireless clone interface names to separate functions.
Diffstat (limited to 'etc/inc/util.inc')
-rw-r--r-- | etc/inc/util.inc | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/etc/inc/util.inc b/etc/inc/util.inc index cbacb3c..a623e9d 100644 --- a/etc/inc/util.inc +++ b/etc/inc/util.inc @@ -961,16 +961,10 @@ function is_interface_mismatch() { if (preg_match("/^enc|^tun|^ppp|^pptp|^pppoe|^ovpn|^gif|^gre|^lagg|^bridge|vlan/i", $ifcfg['if'])) { $i++; } - else { - $baseif = $ifcfg['if']; - if(stristr($baseif, "_wlan")) { - $baseif = substr($baseif, 0, stripos($baseif, "_wlan")); - } - if (does_interface_exist($baseif) == false) { - $do_assign = true; - } else - $i++; - } + else if (does_interface_exist(interface_get_wireless_base($ifcfg['if'])) == false) { + $do_assign = true; + } else + $i++; } if ($g['minimum_nic_count'] > $i) { |