diff options
author | Ermal <eri@pfsense.org> | 2011-01-10 17:21:34 +0000 |
---|---|---|
committer | Ermal <eri@pfsense.org> | 2011-01-10 17:21:34 +0000 |
commit | 0f70d563a23c4fde9a31e9285833ebd3c4edfb95 (patch) | |
tree | 16fe28d02a4971700898a324b9fc94ae647cd3c9 /usr | |
parent | d0d70b03bb35824adc977560d615c5d944025341 (diff) | |
download | pfsense-0f70d563a23c4fde9a31e9285833ebd3c4edfb95.zip pfsense-0f70d563a23c4fde9a31e9285833ebd3c4edfb95.tar.gz |
Ticket #944. Do not use the interface_bring_down fucntion here since it is meant for assigned interfaces. Directly destroy previous vlan interface if parent changes.
Diffstat (limited to 'usr')
-rwxr-xr-x | usr/local/www/interfaces_vlan_edit.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr/local/www/interfaces_vlan_edit.php b/usr/local/www/interfaces_vlan_edit.php index f548386..ea43508 100755 --- a/usr/local/www/interfaces_vlan_edit.php +++ b/usr/local/www/interfaces_vlan_edit.php @@ -96,17 +96,17 @@ if ($_POST) { } if (!$input_errors) { + if (isset($id) && $a_vlans[$id]) { + if ($a_vlans[$id]['if'] != $_POST['if']) + // Destroy previous vlan + pfSense_interface_destroy($a_vlans[$id]['if']); + } $vlan = array(); $vlan['if'] = $_POST['if']; $vlan['tag'] = $_POST['tag']; $vlan['descr'] = $_POST['descr']; $vlan['vlanif'] = "{$_POST['if']}_vlan{$_POST['tag']}"; - if (isset($id) && $a_vlans[$id]) { - if ($a_vlans[$id]['if'] != $_POST['if']) - // Destroy previous vlan - interface_bring_down($a_vlans[$id]['if'], true); - } $vlan['vlanif'] = interface_vlan_configure($vlan); if ($vlan['vlanif'] == "" || !stristr($vlan['vlanif'], "vlan")) $input_errors[] = gettext("Error occured creating interface, please retry."); |