From 1322ee22354f1a6e184819fb7009a2996b63de97 Mon Sep 17 00:00:00 2001 From: Chris Rowe Date: Sun, 24 Apr 2016 23:55:28 +0100 Subject: Make QinQ interfaces work again --- src/etc/inc/interfaces.inc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/etc/inc') diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc index cefa7ab..0543ddf 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 */ -- cgit v1.1