summaryrefslogtreecommitdiffstats
path: root/src/etc/inc
diff options
context:
space:
mode:
authorChris Rowe <chris@c-c-c.co.uk>2016-04-24 23:55:28 +0100
committerChris Rowe <chris@c-c-c.co.uk>2016-04-24 23:55:28 +0100
commit1322ee22354f1a6e184819fb7009a2996b63de97 (patch)
tree18075a1797a84d844867b4a5ed7859d9d5d0cdc4 /src/etc/inc
parent641b5618a764f5b6d56ab72eb7095666d37826b9 (diff)
downloadpfsense-1322ee22354f1a6e184819fb7009a2996b63de97.zip
pfsense-1322ee22354f1a6e184819fb7009a2996b63de97.tar.gz
Make QinQ interfaces work again
Diffstat (limited to 'src/etc/inc')
-rw-r--r--src/etc/inc/interfaces.inc16
1 files changed, 8 insertions, 8 deletions
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 */
OpenPOWER on IntegriCloud