From: Alexandre Derumier <aderumier@odiso.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH ifupdown2 2/3] patch: allow vlan tag inside vxlan tunnel
Date: Mon, 21 Sep 2020 18:51:14 +0200 [thread overview]
Message-ID: <20200921165115.2930386-3-aderumier@odiso.com> (raw)
In-Reply-To: <20200921165115.2930386-1-aderumier@odiso.com>
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
---
...9-allow-vlan-tag-inside-vxlan-tunnel.patch | 31 +++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 32 insertions(+)
create mode 100644 debian/patches/pve/0009-allow-vlan-tag-inside-vxlan-tunnel.patch
diff --git a/debian/patches/pve/0009-allow-vlan-tag-inside-vxlan-tunnel.patch b/debian/patches/pve/0009-allow-vlan-tag-inside-vxlan-tunnel.patch
new file mode 100644
index 0000000..7d0cecd
--- /dev/null
+++ b/debian/patches/pve/0009-allow-vlan-tag-inside-vxlan-tunnel.patch
@@ -0,0 +1,31 @@
+From a53022b71d98abf1cc34bf380309853fbb18b443 Mon Sep 17 00:00:00 2001
+From: Alexandre Derumier <aderumier@odiso.com>
+Date: Mon, 21 Sep 2020 08:47:25 +0200
+Subject: [PATCH] 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 | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/ifupdown2/addons/bridge.py b/ifupdown2/addons/bridge.py
+index 2b9ea84..b835ac2 100644
+--- a/ifupdown2/addons/bridge.py
++++ b/ifupdown2/addons/bridge.py
+@@ -1557,11 +1557,6 @@ class bridge(Addon, 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):
+- 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 = self._ranges_to_ints(vids)
+ try:
+--
+2.20.1
+
diff --git a/debian/patches/series b/debian/patches/series
index a83e94e..1bea610 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,5 @@ pve/0005-ifreload-down-up-vxlan-interfaces-when-ifreload_down.patch
pve/0006-config-tuning.patch
pve/0007-networking.service-fix-dependencies-and-ordering.patch
pve/0008-openvswitch-ovs-ports-condone-regex-exclude-tap-veth.patch
+pve/0009-allow-vlan-tag-inside-vxlan-tunnel.patch
pve/0010-postinst-rm-update-network-config-compatibility.patch
--
2.20.1
next prev parent reply other threads:[~2020-09-21 16:51 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-21 16:51 [pve-devel] [PATCH ifupdown2 0/3] update to last master + fixes Alexandre Derumier
2020-09-21 16:51 ` [pve-devel] [PATCH ifupdown2 1/3] remove patch 0009-address-don-t-process_mtu-if-ovs-mtu-is-defined.patch Alexandre Derumier
2020-09-21 16:51 ` Alexandre Derumier [this message]
2020-09-21 16:51 ` [pve-devel] [PATCH ifupdown2 3/3] update patch10: only rewrite config on first ifupdown2 Alexandre Derumier
2020-09-25 7:30 ` [pve-devel] applied: [PATCH ifupdown2 0/3] update to last master + fixes Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200921165115.2930386-3-aderumier@odiso.com \
--to=aderumier@odiso.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.