merge in downstream packaging changes & drop patches

[ifupdown2.git] / debian / patches / pve / 0007-allow-vlan-tag-inside-vxlan-tunnel.patch

diff --git a/debian/patches/pve/0007-allow-vlan-tag-inside-vxlan-tunnel.patch b/debian/patches/pve/0007-allow-vlan-tag-inside-vxlan-tunnel.patch
new file mode 100644 (file)
index 0000000..9ef0bda
--- /dev/null
+++ b/debian/patches/pve/0007-allow-vlan-tag-inside-vxlan-tunnel.patch
@@ -0,0 +1,33 @@
+From 779d3700fb583b87b03ad2b12d55442058e7d79b Mon Sep 17 00:00:00 2001
+From: Alexandre Derumier <aderumier@odiso.com>
+Date: Mon, 21 Sep 2020 08:47:25 +0200
+Subject: [PATCH 08/12] allow vlan tag inside vxlan tunnel
+
+Cumulus forbid it, but it's totally valid.
+
+Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
+---
+ ifupdown2/addons/bridge.py | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/ifupdown2/addons/bridge.py b/ifupdown2/addons/bridge.py
+index ff98b18..f21424e 100644
+--- a/ifupdown2/addons/bridge.py
++++ b/ifupdown2/addons/bridge.py
+@@ -1718,13 +1718,6 @@ class bridge(Bridge, moduleBase):
+             because kernel does honor vid info flags during deletes.
+ 
+         """
+-        if not isbridge and (bportifaceobj.link_kind & ifaceLinkKind.VXLAN and not bportifaceobj.link_privflags & ifaceLinkPrivFlags.SINGLE_VXLAN):
+-            self.config_check_bridge_vni_svi_limit(bportifaceobj, ifaceobj_getfunc, pvid)
+-
+-            if not vids or not pvid or len(vids) > 1 or vids[0] != pvid:
+-                self._error_vxlan_in_vlan_aware_br(bportifaceobj,
+-                                                   bportifaceobj.upperifaces[0])
+-                return
+ 
+         vids_int =  utils.ranges_to_ints(vids)
+         try:
+-- 
+2.30.2
+