From 113afc4da2d8d3151641550f150d4b095e361cab Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Fri, 15 Jun 2018 09:24:58 +0200 Subject: [PATCH] remove already-applied patch Signed-off-by: Wolfgang Bumiller --- ...link-IFLA_BRPORT_ARP_SUPPRESS-use-32.patch | 30 ------------------- debian/patches/series | 1 - 2 files changed, 31 deletions(-) delete mode 100644 debian/patches/extra/0002-netlink-IFLA_BRPORT_ARP_SUPPRESS-use-32.patch diff --git a/debian/patches/extra/0002-netlink-IFLA_BRPORT_ARP_SUPPRESS-use-32.patch b/debian/patches/extra/0002-netlink-IFLA_BRPORT_ARP_SUPPRESS-use-32.patch deleted file mode 100644 index 90f737b..0000000 --- a/debian/patches/extra/0002-netlink-IFLA_BRPORT_ARP_SUPPRESS-use-32.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 8fc842ad6a75fe0af3a2b8d4937b16e3967fca3c Mon Sep 17 00:00:00 2001 -From: Alexandre Derumier -Date: Wed, 16 May 2018 02:16:42 +0200 -Subject: [PATCH] netlink : IFLA_BRPORT_ARP_SUPPRESS : use 32 - -this has been upstreamed recently in linux kernel, with IFLA_BRPORT_NEIGH_SUPPRESS. -cumulus was using a temp 152 number. -It's need for vxlan + anycast gateway ---- - ifupdown2/nlmanager/nlpacket.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ifupdown2/nlmanager/nlpacket.py b/ifupdown2/nlmanager/nlpacket.py -index bd6addf..358c06c 100644 ---- a/ifupdown2/nlmanager/nlpacket.py -+++ b/ifupdown2/nlmanager/nlpacket.py -@@ -3247,9 +3247,9 @@ class Link(NetlinkPacket): - IFLA_BRPORT_VLAN_TUNNEL = 29 - IFLA_BRPORT_BCAST_FLOOD = 30 - IFLA_BRPORT_GROUP_FWD_MASK = 31 -+ IFLA_BRPORT_ARP_SUPPRESS = 32 - IFLA_BRPORT_PEER_LINK = 150 - IFLA_BRPORT_DUAL_LINK = 151 -- IFLA_BRPORT_ARP_SUPPRESS = 152 - IFLA_BRPORT_GROUP_FWD_MASKHI = 153 - - ifla_brport_to_string = { --- -2.11.0 - diff --git a/debian/patches/series b/debian/patches/series index f1346b0..b5d0802 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ extra/0001-addons-scripts-fix-ENV-for-interfaces-options.patch -extra/0002-netlink-IFLA_BRPORT_ARP_SUPPRESS-use-32.patch extra/0003-add-vxlan-physdev-support.patch pve/0001-config-tuning.patch pve/0002-manual-interfaces-set-link-up.patch -- 2.39.2