From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Date: Wed, 6 Jul 2016 11:46:04 +0000 (+0200)
Subject: fix exported symbols in librte_bond
X-Git-Tag: debian/16.07-1~105
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;ds=sidebyside;h=9a7433f0b76e00580598d42111627cf679d3631b;p=deb_dpdk.git

fix exported symbols in librte_bond

Change-Id: Ie02e1a8e8527f0987cb90b8a28778551bbfaff31
Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
---

diff --git a/debian/patches/series b/debian/patches/series
index cbebc519..c0e0c686 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+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
new file mode 100644
index 00000000..d31c61ed
--- /dev/null
+++ b/debian/patches/ubuntu-fix-bond-symbol-export.patch
@@ -0,0 +1,63 @@
+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,