diff options
author | Erik Fonnesbeck <efonnes@gmail.com> | 2010-02-24 11:34:42 -0700 |
---|---|---|
committer | Erik Fonnesbeck <efonnes@gmail.com> | 2010-02-24 11:34:42 -0700 |
commit | 38b7d47d71d5955d00a2726619621af3afd8c20a (patch) | |
tree | fb9a8cead93d7ad8060c591b05b4cbe80081aced | |
parent | 7c53bc7b0809d5ed47199327404dcd62484f4fbd (diff) | |
download | pfsense-38b7d47d71d5955d00a2726619621af3afd8c20a.zip pfsense-38b7d47d71d5955d00a2726619621af3afd8c20a.tar.gz |
Revert "Don't skip disabled interfaces when checking which are assigned." and fix an error propagated from this. (misread a parameter name when looking up the function)
This reverts commit ce075a0fd4aa7eb0788f20233bf60706e4c77edf.
-rw-r--r-- | etc/inc/interfaces.inc | 2 | ||||
-rw-r--r-- | usr/local/www/interfaces_wireless.php | 2 | ||||
-rw-r--r-- | usr/local/www/interfaces_wireless_edit.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 3a38ddb..bb0fe97 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -1433,7 +1433,7 @@ function interface_sync_wireless_clones(&$ifcfg, $sync_changes = false) { $baseif = interface_get_wireless_base($ifcfg['if']); - $iflist = get_configured_interface_list(); + $iflist = get_configured_interface_list(false, true); foreach ($iflist as $if) { if ($baseif == interface_get_wireless_base($config['interfaces'][$if]['if']) && $ifcfg['if'] != $config['interfaces'][$if]['if']) { if (isset($config['interfaces'][$if]['wireless']['standard']) || $sync_changes) { diff --git a/usr/local/www/interfaces_wireless.php b/usr/local/www/interfaces_wireless.php index 1940a7d..9032726 100644 --- a/usr/local/www/interfaces_wireless.php +++ b/usr/local/www/interfaces_wireless.php @@ -48,7 +48,7 @@ $a_clones = &$config['wireless']['clone'] ; function clone_inuse($cloneif) { global $config; - $iflist = get_configured_interface_list(); + $iflist = get_configured_interface_list(false, true); foreach ($iflist as $if) { if ($config['interfaces'][$if]['if'] == $cloneif) return true; diff --git a/usr/local/www/interfaces_wireless_edit.php b/usr/local/www/interfaces_wireless_edit.php index d40d52a..29005ff 100644 --- a/usr/local/www/interfaces_wireless_edit.php +++ b/usr/local/www/interfaces_wireless_edit.php @@ -48,7 +48,7 @@ $a_clones = &$config['wireless']['clone']; function clone_inuse($cloneif) { global $config; - $iflist = get_configured_interface_list(); + $iflist = get_configured_interface_list(false, true); foreach ($iflist as $if) { if ($config['interfaces'][$if]['if'] == $cloneif) return true; |