]> git.proxmox.com Git - ifupdown2.git/commitdiff
remove already-applied patch
authorWolfgang Bumiller <w.bumiller@proxmox.com>
Fri, 15 Jun 2018 07:24:58 +0000 (09:24 +0200)
committerWolfgang Bumiller <w.bumiller@proxmox.com>
Fri, 15 Jun 2018 07:56:35 +0000 (09:56 +0200)
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
debian/patches/extra/0002-netlink-IFLA_BRPORT_ARP_SUPPRESS-use-32.patch [deleted file]
debian/patches/series

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 (file)
index 90f737b..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-From 8fc842ad6a75fe0af3a2b8d4937b16e3967fca3c Mon Sep 17 00:00:00 2001
-From: Alexandre Derumier <aderumier@odiso.com>
-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
-
index f1346b0514be640c24b72eb34eab9403512ab551..b5d08026bd3e19bbd76159c283476c5db52de000 100644 (file)
@@ -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