allow vlan subinterface in vlan aware bridge

(for qinq)

diff --git a/debian/patches/pve/0005-allow-vlan-subinterface-in-a-vlan-aware-bridge.patch b/debian/patches/pve/0005-allow-vlan-subinterface-in-a-vlan-aware-bridge.patch
new file mode 100644 (file)
index 0000000..78a81d8
--- /dev/null
+++ b/debian/patches/pve/0005-allow-vlan-subinterface-in-a-vlan-aware-bridge.patch
@@ -0,0 +1,49 @@
+From e4c6c2ace429d34ed0cda21fe4a08c67a7047d67 Mon Sep 17 00:00:00 2001
+From: Alexandre Derumier <aderumier@odiso.com>
+Date: Mon, 1 Apr 2019 09:17:11 +0200
+Subject: [PATCH pve-network 1/2] allow vlan subinterface in a vlan-aware
+ bridge
+
+for stacked/qinq vlan, it's perfectly fine to have a vlan-aware bridge with a tagged interface port
+
+fix:
+https://github.com/CumulusNetworks/ifupdown2/issues/92
+
+sample config:
+
+auto eth0.2
+iface eth0.2 inet manual
+
+auto bridge
+iface bridge inet manual
+        bridge-ports eth0.2
+        bridge-stp off
+        bridge-fd 0
+        bridge-vlan-aware yes
+
+bridge         8000.c81f66f8688c       no              eth0.2
+
+Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
+---
+ ifupdown2/addons/bridge.py | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/ifupdown2/addons/bridge.py b/ifupdown2/addons/bridge.py
+index 9c1de18..e70fc07 100644
+--- a/ifupdown2/addons/bridge.py
++++ b/ifupdown2/addons/bridge.py
+@@ -773,11 +773,6 @@ class bridge(moduleBase):
+             result = True
+             for port_name in ports:
+                 port_obj_l = ifaceobj_getfunc(port_name)
+-                if port_obj_l and port_obj_l[0].link_kind & ifaceLinkKind.VLAN:
+-                    self.logger.error('%s: %s: vlan sub-interface is not '
+-                                      'supported in a vlan-aware bridge'
+-                                      % (ifaceobj.name, port_name))
+-                    result = False
+                 if (port_obj_l and
+                     port_obj_l[0].get_attr_value('bridge-arp-nd-suppress') and
+                     self.arp_nd_suppress_only_on_vxlan and
+-- 
+2.11.0
+

diff --git a/debian/patches/series b/debian/patches/series
index eb6607d343911da1082585b09370662ee4724406..5fc2cfc8a558456502208fbcacc90805ebeaeebf 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ pve/0001-config-tuning.patch
 pve/0002-don-t-remove-tap-veth-fwpr-interfaces-from-bridge-on.patch
 pve/0003-add-dummy-mtu-bridgevlanport-modules.patch
 pve/0004-debian-fixup-networking.service.patch
+pve/0005-allow-vlan-subinterface-in-a-vlan-aware-bridge.patch