debian/patches/pve/0004-allow-vlan-subinterface-in-a-vlan-aware-bridge.patch

   1 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
   2 From: Alexandre Derumier <aderumier@odiso.com>
   3 Date: Mon, 1 Apr 2019 09:17:11 +0200
   4 Subject: [PATCH] allow vlan subinterface in a vlan-aware bridge
   5
   6 for stacked/qinq vlan, it's perfectly fine to have a vlan-aware bridge with a tagged interface port
   7
   8 fix:
   9 https://github.com/CumulusNetworks/ifupdown2/issues/92
  10
  11 sample config:
  12
  13 auto eth0.2
  14 iface eth0.2 inet manual
  15
  16 auto bridge
  17 iface bridge inet manual
  18         bridge-ports eth0.2
  19         bridge-stp off
  20         bridge-fd 0
  21         bridge-vlan-aware yes
  22
  23 bridge          8000.c81f66f8688c       no              eth0.2
  24
  25 Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
  26 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  27 ---
  28  ifupdown2/addons/bridge.py | 5 -----
  29  1 file changed, 5 deletions(-)
  30
  31 diff --git a/ifupdown2/addons/bridge.py b/ifupdown2/addons/bridge.py
  32 index f40e2e7..ebe2f7b 100644
  33 --- a/ifupdown2/addons/bridge.py
  34 +++ b/ifupdown2/addons/bridge.py
  35 @@ -790,11 +790,6 @@ class bridge(moduleBase):
  36              result = True
  37              for port_name in ports:
  38                  port_obj_l = ifaceobj_getfunc(port_name)
  39 -                if port_obj_l and port_obj_l[0].link_kind & ifaceLinkKind.VLAN:
  40 -                    self.logger.error('%s: %s: vlan sub-interface is not '
  41 -                                      'supported in a vlan-aware bridge'
  42 -                                      % (ifaceobj.name, port_name))
  43 -                    result = False
  44                  if (port_obj_l and
  45                      port_obj_l[0].get_attr_value('bridge-arp-nd-suppress') and
  46                      self.arp_nd_suppress_only_on_vxlan and