aboutsummaryrefslogtreecommitdiffstats
path: root/debian/patches
diff options
context:
space:
mode:
authorChristian Ehrhardt <christian.ehrhardt@canonical.com>2016-07-19 08:32:40 +0200
committerChristian Ehrhardt <christian.ehrhardt@canonical.com>2016-07-19 08:42:18 +0200
commita4d38f50e488a9b5116ed26f423d4d13819a401a (patch)
tree3fa54a62732d3a2774f04bf19bb694c59a874213 /debian/patches
parent9ecc306d7eeeb3bb612b968250f203093a721781 (diff)
droping upstreamed backports d/p/ubuntu-fix-bond-symbol-export.patch
Change-Id: I8033e131db207b35d345bc4472d853acc59e7bc8 Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/series1
-rw-r--r--debian/patches/ubuntu-fix-bond-symbol-export.patch63
2 files changed, 0 insertions, 64 deletions
diff --git a/debian/patches/series b/debian/patches/series
index c0e0c686..cbebc519 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-ubuntu-fix-bond-symbol-export.patch
ubuntu-backport-33-vhost-user-add-error-handling-for-fd-1023.patch
ubuntu-fix-vhost-user-socket-permission.patch
diff --git a/debian/patches/ubuntu-fix-bond-symbol-export.patch b/debian/patches/ubuntu-fix-bond-symbol-export.patch
deleted file mode 100644
index d31c61ed..00000000
--- a/debian/patches/ubuntu-fix-bond-symbol-export.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Description: librte_bond: fix exported symbols
-
-The ABI changed in 16.07, but with compat to former 2.0 in place.
-This was accidentially exported as 16.04 instead of 2.0 symbol.
-
-Forwarded: yes
-Author: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-Last-Update: 2016-07-06
-
-Index: deb_dpdk/drivers/net/bonding/rte_eth_bond_8023ad.c
-===================================================================
---- deb_dpdk.orig/drivers/net/bonding/rte_eth_bond_8023ad.c
-+++ deb_dpdk/drivers/net/bonding/rte_eth_bond_8023ad.c
-@@ -1068,7 +1068,7 @@ bond_mode_8023ad_conf_assign(struct mode
- }
-
- static void
--bond_mode_8023ad_setup_v1604(struct rte_eth_dev *dev,
-+bond_mode_8023ad_setup_v20(struct rte_eth_dev *dev,
- struct rte_eth_bond_8023ad_conf *conf)
- {
- struct rte_eth_bond_8023ad_conf def_conf;
-@@ -1214,7 +1214,7 @@ free_out:
- }
-
- int
--rte_eth_bond_8023ad_conf_get_v1604(uint8_t port_id,
-+rte_eth_bond_8023ad_conf_get_v20(uint8_t port_id,
- struct rte_eth_bond_8023ad_conf *conf)
- {
- struct rte_eth_dev *bond_dev;
-@@ -1229,7 +1229,7 @@ rte_eth_bond_8023ad_conf_get_v1604(uint8
- bond_mode_8023ad_conf_get(bond_dev, conf);
- return 0;
- }
--VERSION_SYMBOL(rte_eth_bond_8023ad_conf_get, _v1604, 16.04);
-+VERSION_SYMBOL(rte_eth_bond_8023ad_conf_get, _v20, 2.0);
-
- int
- rte_eth_bond_8023ad_conf_get_v1607(uint8_t port_id,
-@@ -1278,7 +1278,7 @@ bond_8023ad_setup_validate(uint8_t port_
- }
-
- int
--rte_eth_bond_8023ad_setup_v1604(uint8_t port_id,
-+rte_eth_bond_8023ad_setup_v20(uint8_t port_id,
- struct rte_eth_bond_8023ad_conf *conf)
- {
- struct rte_eth_dev *bond_dev;
-@@ -1289,11 +1289,11 @@ rte_eth_bond_8023ad_setup_v1604(uint8_t
- return err;
-
- bond_dev = &rte_eth_devices[port_id];
-- bond_mode_8023ad_setup_v1604(bond_dev, conf);
-+ bond_mode_8023ad_setup_v20(bond_dev, conf);
-
- return 0;
- }
--VERSION_SYMBOL(rte_eth_bond_8023ad_setup, _v1604, 16.04);
-+VERSION_SYMBOL(rte_eth_bond_8023ad_setup, _v20, 2.0);
-
- int
- rte_eth_bond_8023ad_setup_v1607(uint8_t port_id,