diff options
author | Renato Botelho <garga@FreeBSD.org> | 2013-03-08 10:54:03 -0300 |
---|---|---|
committer | Renato Botelho <garga@FreeBSD.org> | 2013-03-08 10:54:03 -0300 |
commit | 76254caa8a0133520dbc4e2b8b1d01afa6f07a23 (patch) | |
tree | 70df17cf1d4e3ca90afda540b77e1943500e9603 /etc/inc | |
parent | f5c2bf1e3cb1683a585d2f6c97206b19d5e5df01 (diff) | |
download | pfsense-76254caa8a0133520dbc4e2b8b1d01afa6f07a23.zip pfsense-76254caa8a0133520dbc4e2b8b1d01afa6f07a23.tar.gz |
Be consistent on vlan checks
Diffstat (limited to 'etc/inc')
-rw-r--r-- | etc/inc/interfaces.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 2d19dc9..4ef1e58 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -323,7 +323,7 @@ function interface_qinq_configure(&$vlan, $fd = NULL) { /* invalidate interface cache */ get_interface_arr(true); - if (!stristr($qinqif, "vlan")) + if (!stristr($qinqif, "_vlan")) mwexec("/sbin/ifconfig {$qinqif} promisc\n"); $macaddr = get_interface_mac($qinqif); @@ -2980,7 +2980,7 @@ function interface_configure($interface = "wan", $reloadall = false, $linkupeven } if ($wancfg['mtu'] != get_interface_mtu($realif)) pfSense_interface_mtu($realif, $wancfg['mtu']); - } else if (stristr($realif, "vlan")) { + } else if (stristr($realif, "_vlan")) { /* XXX: This is really dangerous for example with vlans changing their parent mtu! */ $bigmtu = interface_vlan_mtu_configured($realhwif, $mtu); if ($mtu < $bigmtu) @@ -3833,7 +3833,7 @@ function get_parent_interface($interface) { case "static": default: // Handle _vlans - if (strstr($realif,"_vlan")) + if (stristr($realif,"_vlan")) if (is_array($config['vlans']['vlan'])) foreach ($config['vlans']['vlan'] as $vlanidx => $vlan) if ($ifcfg['if'] == $vlan['vlanif']){ @@ -4671,7 +4671,7 @@ function is_altq_capable($int) { return true; else if (stristr($int, "l2tp")) /* VLANs are name $parent_$vlan now */ return true; - else if (stristr($int, "vlan")) /* VLANs are name $parent_$vlan now */ + else if (stristr($int, "_vlan")) /* VLANs are name $parent_$vlan now */ return true; else if (stristr($int, "_wlan")) /* WLANs are name $parent_$wlan now */ return true; |