remove patch 0009-address-don-t-process_mtu-if-ovs-mtu-is-defined.patch

upstream : https://github.com/CumulusNetworks/ifupdown2/commit/8994bdd39af6014c6de02cb0d9eb15535af2123e#diff-1481ea1b5d4c5d73242f448fc8412b21
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>

diff --git a/debian/patches/pve/0009-address-don-t-process_mtu-if-ovs-mtu-is-defined.patch b/debian/patches/pve/0009-address-don-t-process_mtu-if-ovs-mtu-is-defined.patch
deleted file mode 100644 (file)
index d12a6ed..0000000
--- a/debian/patches/pve/0009-address-don-t-process_mtu-if-ovs-mtu-is-defined.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 54dbee161aa2fd281046386c10123222b790ebfc Mon Sep 17 00:00:00 2001
-From: Alexandre Derumier <aderumier@odiso.com>
-Date: Wed, 3 Jun 2020 13:06:14 +0200
-Subject: [PATCH] address: don't process_mtu if ovs-mtu is defined
-
-Openvswitch already manage mtu if ovs-mtu is defined.
-(Ovs manage mtu in userland, and sync mtu for some interfaces in kernel).
-
-Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
----
- ifupdown2/addons/address.py | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/ifupdown2/addons/address.py b/ifupdown2/addons/address.py
-index 6578ebb..9a20c9e 100644
---- a/ifupdown2/addons/address.py
-+++ b/ifupdown2/addons/address.py
-@@ -881,6 +881,11 @@ class address(Addon, moduleBase):
- 
-     def process_mtu(self, ifaceobj, ifaceobj_getfunc):
-         mtu_str = ifaceobj.get_attr_value_first('mtu')
-+
-+        ovs_mtu = ifaceobj.get_attr_value_first('ovs-mtu')
-+        if ovs_mtu:
-+            return
-+
-         mtu_from_policy = False
- 
-         if not mtu_str:
--- 
-2.20.1
-

diff --git a/debian/patches/series b/debian/patches/series
index b454408d820d8f64d9af2b0351498efea9837947..a83e94e5d6958c9f9d23b0e8556f569887556ef4 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,5 +6,4 @@ 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-address-don-t-process_mtu-if-ovs-mtu-is-defined.patch
 pve/0010-postinst-rm-update-network-config-compatibility.patch