diff options
| author | Ermal Luçi <eri@pfsense.org> | 2010-01-12 11:57:57 +0000 |
|---|---|---|
| committer | Ermal Luçi <eri@pfsense.org> | 2010-01-12 11:57:57 +0000 |
| commit | 494be6e8507796cdc9eb8c188d26e45ff7d3edec (patch) | |
| tree | 39b32afd1f9a683f1ad7ba4ad749c368d00bd20c | |
| parent | cb58f26ce1164dd17249c48f9e46a1bd2a707617 (diff) | |
| download | pfsense-494be6e8507796cdc9eb8c188d26e45ff7d3edec.zip pfsense-494be6e8507796cdc9eb8c188d26e45ff7d3edec.tar.gz | |
Resolves #279. Do not show vlans as parent interfaces for other vlans.
| -rw-r--r-- | etc/inc/util.inc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/etc/inc/util.inc b/etc/inc/util.inc index bf45ddd..d975ada 100644 --- a/etc/inc/util.inc +++ b/etc/inc/util.inc @@ -538,7 +538,8 @@ function get_interface_list($mode = "active", $keyby = "physical", $vfaces = "") $alink = explode(" ", $link); $ifname = rtrim(trim($alink[0]), '*'); /* trim out all numbers before checking for vfaces */ - if (!in_array(array_shift(preg_split('/\d/', $ifname)), $vfaces)) { + if (!in_array(array_shift(preg_split('/\d/', $ifname)), $vfaces) && + !stristr($ifname, "_vlan")) { $toput = array( "mac" => trim($alink[1]), "up" => in_array($ifname, $upints) @@ -1137,4 +1138,4 @@ function is_URL($url) { return false; } -?>
\ No newline at end of file +?> |
