diff options
| author | Chris Rowe <chris@c-c-c.co.uk> | 2016-04-24 23:55:28 +0100 |
|---|---|---|
| committer | Stephen Beaver <sbeaver@netgate.com> | 2016-06-22 10:55:50 -0400 |
| commit | de1bacbcd1473f52994601fead5e6949860f1f0a (patch) | |
| tree | 1bde0cde70cdd49e032873c2ea099f6a150f3356 | |
| parent | 61d6a840d01acf1aa744ed8c97c6acd903ce2ccc (diff) | |
| download | pfsense-de1bacbcd1473f52994601fead5e6949860f1f0a.zip pfsense-de1bacbcd1473f52994601fead5e6949860f1f0a.tar.gz | |
Make QinQ interfaces work again
(cherry picked from commit 1322ee22354f1a6e184819fb7009a2996b63de97)
| -rw-r--r-- | src/etc/inc/interfaces.inc | 16 | ||||
| -rw-r--r-- | src/usr/local/www/interfaces_assign.php | 8 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc index 8fa48fc..472b4b3 100644 --- a/src/etc/inc/interfaces.inc +++ b/src/etc/inc/interfaces.inc @@ -318,17 +318,17 @@ function interface_qinq_configure(&$vlan, $fd = NULL) { pfSense_ngctl_attach(".", $qinqif); if (!empty($vlanif) && does_interface_exist($vlanif)) { - fwrite($fd, "shutdown {$qinqif}qinq:\n"); - exec("/usr/sbin/ngctl msg {$qinqif}qinq: gettable", $result); + fwrite($fd, "shutdown {$vlanif}qinq:\n"); + exec("/usr/sbin/ngctl msg {$vlanif}qinq: gettable", $result); if (empty($result)) { - fwrite($fd, "mkpeer {$qinqif}: vlan lower downstream\n"); - fwrite($fd, "name {$qinqif}:lower {$vlanif}qinq\n"); - fwrite($fd, "connect {$qinqif}: {$vlanif}qinq: upper nomatch\n"); + fwrite($fd, "mkpeer {$vlanif}: vlan lower downstream\n"); + fwrite($fd, "name {$vlanif}:lower {$vlanif}qinq\n"); + fwrite($fd, "connect {$vlanif}: {$vlanif}qinq: upper nomatch\n"); } } else { - fwrite($fd, "mkpeer {$qinqif}: vlan lower downstream\n"); - fwrite($fd, "name {$qinqif}:lower {$vlanif}qinq\n"); - fwrite($fd, "connect {$qinqif}: {$vlanif}qinq: upper nomatch\n"); + fwrite($fd, "mkpeer {$vlanif}: vlan lower downstream\n"); + fwrite($fd, "name {$vlanif}:lower {$vlanif}qinq\n"); + fwrite($fd, "connect {$vlanif}: {$vlanif}qinq: upper nomatch\n"); } /* invalidate interface cache */ diff --git a/src/usr/local/www/interfaces_assign.php b/src/usr/local/www/interfaces_assign.php index 68d2d32..73d4839 100644 --- a/src/usr/local/www/interfaces_assign.php +++ b/src/usr/local/www/interfaces_assign.php @@ -191,13 +191,13 @@ if (is_array($config['laggs']['lagg']) && count($config['laggs']['lagg'])) { /* add QinQ interfaces */ if (is_array($config['qinqs']['qinqentry']) && count($config['qinqs']['qinqentry'])) { foreach ($config['qinqs']['qinqentry'] as $qinq) { - $portlist["vlan{$qinq['tag']}"]['descr'] = "VLAN {$qinq['tag']}"; - $portlist["vlan{$qinq['tag']}"]['isqinq'] = true; + $portlist["{$qinq['vlanif']}"]['descr'] = "VLAN {$qinq['tag']} on {$qinq['if']}"; + $portlist["{$qinq['vlanif']}"]['isqinq'] = true; /* QinQ members */ $qinqifs = explode(' ', $qinq['members']); foreach ($qinqifs as $qinqif) { - $portlist["vlan{$qinq['tag']}_{$qinqif}"]['descr'] = "QinQ {$qinqif}"; - $portlist["vlan{$qinq['tag']}_{$qinqif}"]['isqinq'] = true; + $portlist["{$qinq['vlanif']}_{$qinqif}"]['descr'] = "QinQ {$qinqif} on VLAN {$qinq['tag']} on {$qinq['if']}"; + $portlist["{$qinq['vlanif']}_{$qinqif}"]['isqinq'] = true; } } } |
