debian/patches/pve/0007-allow-vlan-tag-inside-vxlan-tunnel.patch

   1 From 779d3700fb583b87b03ad2b12d55442058e7d79b Mon Sep 17 00:00:00 2001
   2 From: Alexandre Derumier <aderumier@odiso.com>
   3 Date: Mon, 21 Sep 2020 08:47:25 +0200
   4 Subject: [PATCH 08/12] allow vlan tag inside vxlan tunnel
   5
   6 Cumulus forbid it, but it's totally valid.
   7
   8 Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
   9 ---
  10  ifupdown2/addons/bridge.py | 7 -------
  11  1 file changed, 7 deletions(-)
  12
  13 diff --git a/ifupdown2/addons/bridge.py b/ifupdown2/addons/bridge.py
  14 index ff98b18..f21424e 100644
  15 --- a/ifupdown2/addons/bridge.py
  16 +++ b/ifupdown2/addons/bridge.py
  17 @@ -1718,13 +1718,6 @@ class bridge(Bridge, moduleBase):
  18              because kernel does honor vid info flags during deletes.
  19
  20          """
  21 -        if not isbridge and (bportifaceobj.link_kind & ifaceLinkKind.VXLAN and not bportifaceobj.link_privflags & ifaceLinkPrivFlags.SINGLE_VXLAN):
  22 -            self.config_check_bridge_vni_svi_limit(bportifaceobj, ifaceobj_getfunc, pvid)
  23 -
  24 -            if not vids or not pvid or len(vids) > 1 or vids[0] != pvid:
  25 -                self._error_vxlan_in_vlan_aware_br(bportifaceobj,
  26 -                                                   bportifaceobj.upperifaces[0])
  27 -                return
  28
  29          vids_int =  utils.ranges_to_ints(vids)
  30          try:
  31 --
  32 2.30.2
  33