Change method of displaying wireless clone interfaces on the assignment page.

1 files changed, 4 insertions, 3 deletions

diff --git a/etc/inc/util.inc b/etc/inc/util.inc
index a623e9d..d31e1a9 100644
--- a/etc/inc/util.inc
+++ b/etc/inc/util.inc
@@ -499,6 +499,7 @@ function get_interface_list($mode = "active", $keyby = "physical", $vfaces = "")
 				'lo',
 				'ng',
 				'_vlan',
+				'_wlan',
 				'pflog',
 				'plip',
 				'pfsync',
@@ -539,7 +540,7 @@ function get_interface_list($mode = "active", $keyby = "physical", $vfaces = "")
                 $ifname = rtrim(trim($alink[0]), '*');
                 /* trim out all numbers before checking for vfaces */
 		if (!in_array(array_shift(preg_split('/\d/', $ifname)), $vfaces) &&
-			!stristr($ifname, "_vlan") && !stristr($ifname, "_wlan0")) {
+			!stristr($ifname, "_vlan") && !stristr($ifname, "_wlan")) {
 			$toput = array(
 					"mac" => trim($alink[1]),
 					"up" => in_array($ifname, $upints)
@@ -958,10 +959,10 @@ function is_interface_mismatch() {
         $do_assign = false;
         $i = 0;
         foreach ($config['interfaces'] as $ifname => $ifcfg) {
-                if (preg_match("/^enc|^tun|^ppp|^pptp|^pppoe|^ovpn|^gif|^gre|^lagg|^bridge|vlan/i", $ifcfg['if'])) {
+                if (preg_match("/^enc|^tun|^ppp|^pptp|^pppoe|^ovpn|^gif|^gre|^lagg|^bridge|vlan|_wlan/i", $ifcfg['if'])) {
                         $i++;
                 }
-                else if (does_interface_exist(interface_get_wireless_base($ifcfg['if'])) == false) {
+                else if (does_interface_exist($ifcfg['if']) == false) {
                         $do_assign = true;
                 } else
                         $i++;