From 5001e57811918e65e5c409d11dd6798c28f88c2d Mon Sep 17 00:00:00 2001
From: DmitriyEshenko <dmitriy.eshenko@vyos.io>
Date: Sat, 4 Apr 2020 12:57:52 +0000
Subject: bridge: T2197: Fix path for QinQ S-VLANs

---
 scripts/vyatta-bridge.pl | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/vyatta-bridge.pl b/scripts/vyatta-bridge.pl
index 7602c2ce..4d02ed60 100755
--- a/scripts/vyatta-bridge.pl
+++ b/scripts/vyatta-bridge.pl
@@ -47,7 +47,13 @@ die "Unknown interface type $ifname\n"
     unless $intf;
 
 my $cfg = new Vyatta::Config;
-$cfg->setLevel($intf->path());
+# Change path for QinQ S-VLAN
+my $vif_s_path = "interfaces $intf->{type} $intf->{dev} vif-s $intf->{vif}";
+if (!$intf->{vif_c} && ($cfg->exists($vif_s_path) or $cfg->existsOrig($vif_s_path))) {
+    $cfg->setLevel($vif_s_path);
+}else {
+    $cfg->setLevel($intf->path());
+}
 
 my $oldbridge = $cfg->returnOrigValue('bridge-group bridge');
 my $newbridge = $cfg->returnValue('bridge-group bridge');
-- 
cgit v1.2.3