diff options
| author | Ermal Luçi <eri@pfsense.org> | 2010-02-23 22:37:24 +0000 |
|---|---|---|
| committer | Ermal Luçi <eri@pfsense.org> | 2010-02-23 22:37:24 +0000 |
| commit | f2dd75680ee113f59171102d2b49608f096d23c1 (patch) | |
| tree | 0c811c6502df019dd7a6976c089f3bc9f4269a0c /etc | |
| parent | 930595154ccc8702befdd880f1c424b78040af2a (diff) | |
| download | pfsense-f2dd75680ee113f59171102d2b49608f096d23c1.zip pfsense-f2dd75680ee113f59171102d2b49608f096d23c1.tar.gz | |
Revert "Fix linking interface to vlans function so it works correctly."
This reverts commit 930595154ccc8702befdd880f1c424b78040af2a.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/gwlb.inc | 2 | ||||
| -rw-r--r-- | etc/inc/interfaces.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/etc/inc/gwlb.inc b/etc/inc/gwlb.inc index d27e0ec..3cb4727 100644 --- a/etc/inc/gwlb.inc +++ b/etc/inc/gwlb.inc @@ -520,7 +520,7 @@ function get_interface_gateway($interface, &$dynamic = false) { $gw = lookup_gateway_ip_by_name($gwcfg['gateway']); // for dynamic interfaces we handle them through the $interface_router file. - if (!is_ipaddr($gw) && !is_ipaddr($gwcfg['ipaddr'])) { + if (!is_ipaddr($gw)) { $realif = get_real_interface($interface); if (file_exists("{$g['tmp_path']}/{$realif}_router")) { $gw = file_get_contents("{$g['tmp_path']}/{$realif}_router"); diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 767a9e2..9941a56 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -2584,7 +2584,7 @@ function link_interface_to_vlans($int, $action = "") { $real_if = get_real_interface($int); if (is_array($config['vlans']['vlan'])) { foreach ($config['vlans']['vlan'] as $vlan) { - if ($real_if == $vlan['if']) { + if ($real_int == $vlan['if']) { if ($action == "update") { foreach ($config['interfaces'] as $ifname => $ifcfg) { if ($ifcfg['if'] == $vlan['vlanif']) |
