summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/inc/config.inc2
-rwxr-xr-xusr/local/www/interfaces_vlan_edit.php4
2 files changed, 3 insertions, 3 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc
index 3283642..3f81ab0 100644
--- a/etc/inc/config.inc
+++ b/etc/inc/config.inc
@@ -1292,7 +1292,7 @@ endif;
if ($config['version'] <= 4.4) {
if (is_array($config['vlans']['vlan']) && count($config['vlans']['vlan'])) {
foreach ($config['vlans']['vlan'] as $id => &$vlan)
- $vlan['vlanif'] = "vlan{$id}";
+ $vlan['vlanif'] = "vlan{$tag}";
}
$config['version'] = "4.5";
}
diff --git a/usr/local/www/interfaces_vlan_edit.php b/usr/local/www/interfaces_vlan_edit.php
index 063387d..72224c5 100755
--- a/usr/local/www/interfaces_vlan_edit.php
+++ b/usr/local/www/interfaces_vlan_edit.php
@@ -48,7 +48,7 @@ $portlist = get_interface_list();
/* add LAGG interfaces */
if (is_array($config['laggs']['lagg']) && count($config['laggs']['lagg'])) {
- foreach ($config['laggs']['lagg'] as $lagg) {
+ foreach ($config['laggs']['lagg'] as $lagg)
$portlist[$lagg['laggif']] = $lagg;
}
@@ -95,7 +95,7 @@ if ($_POST) {
$vlan['descr'] = $_POST['descr'];
$vlan['vlanif'] = $_POST['vlanif'];
- $vlan['vlanif'] = interface_vlan_configure($vlan['if'], $vlan['tag'], $vlan['vlanif']);
+ $vlan['vlanif'] = interface_vlan_configure($vlan['if'], $vlan['tag'], "vlan" . $vlan['tag']);
if ($vlan['vlanif'] == "" || !stristr($vlan['vlanif'], "vlan"))
$input_errors[] = "Error occured creating interface, please retry.";
else {
OpenPOWER on IntegriCloud