summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2019-08-20 12:38:08 +0200
committerDamjan Marion <dmarion@me.com>2019-08-21 14:32:29 +0000
commitb6103105f99e0c7f210a9596f205a1efd21b626f (patch)
tree219616982d763d5e6cb732ce27a62ed350611379
parent017002ae357a05ca1ae1b7d8fbc7bbc8063c9e34 (diff)
dpdk: bump DPDK version to 19.08
Type: feature Change-Id: I16b8cdf0b6af6715a5f01ad84365a8c8a1b76237 Signed-off-by: Damjan Marion <damarion@cisco.com>
-rw-r--r--build/external/packages/dpdk.mk5
-rw-r--r--src/plugins/dpdk/device/common.c6
-rw-r--r--src/plugins/dpdk/device/device.c3
-rw-r--r--src/plugins/dpdk/device/init.c2
4 files changed, 6 insertions, 10 deletions
diff --git a/build/external/packages/dpdk.mk b/build/external/packages/dpdk.mk
index 17a2638ecce..c370f4574e5 100644
--- a/build/external/packages/dpdk.mk
+++ b/build/external/packages/dpdk.mk
@@ -21,13 +21,13 @@ DPDK_MLX5_PMD ?= n
DPDK_TAP_PMD ?= n
DPDK_FAILSAFE_PMD ?= n
-DPDK_VERSION ?= 19.05
+DPDK_VERSION ?= 19.08
DPDK_BASE_URL ?= http://fast.dpdk.org/rel
DPDK_TARBALL := dpdk-$(DPDK_VERSION).tar.xz
DPDK_TAR_URL := $(DPDK_BASE_URL)/$(DPDK_TARBALL)
DPDK_18.11_TARBALL_MD5_CKSUM := 04b86f4a77f4f81a7fbd26467dd2ea9f
-DPDK_19.02_TARBALL_MD5_CKSUM := 23944a2cdee061aa4bd72ebe7d836db0
DPDK_19.05_TARBALL_MD5_CKSUM := fe22ad1bab1539945119047b0fdf1105
+DPDK_19.08_TARBALL_MD5_CKSUM := 8a6f5bd844b7a06b34787063409298ed
MACHINE=$(shell uname -m)
# replace dot with space, and if 3rd word exists we deal with stable dpdk rel
@@ -182,7 +182,6 @@ $(B)/custom-config: $(B)/.dpdk-patch.ok Makefile
$(call set,RTE_MAX_LCORE,256)
$(call set,RTE_PKTMBUF_HEADROOM,$(DPDK_PKTMBUF_HEADROOM))
$(call set,RTE_CACHE_LINE_SIZE,$(DPDK_CACHE_LINE_SIZE))
- $(call set,RTE_LIBEAL_USE_HPET,y)
$(call set,RTE_BUILD_COMBINE_LIBS,y)
$(call set,RTE_PCI_CONFIG,y)
$(call set,RTE_PCI_EXTENDED_TAG,"on")
diff --git a/src/plugins/dpdk/device/common.c b/src/plugins/dpdk/device/common.c
index 11b0538fc46..f91e3bf836f 100644
--- a/src/plugins/dpdk/device/common.c
+++ b/src/plugins/dpdk/device/common.c
@@ -174,10 +174,8 @@ dpdk_device_start (dpdk_device_t * xd)
}
if (xd->default_mac_address)
- rv =
- rte_eth_dev_default_mac_addr_set (xd->port_id,
- (struct ether_addr *)
- xd->default_mac_address);
+ rv = rte_eth_dev_default_mac_addr_set (xd->port_id,
+ (void *) xd->default_mac_address);
if (rv)
dpdk_device_error (xd, "rte_eth_dev_default_mac_addr_set", rv);
diff --git a/src/plugins/dpdk/device/device.c b/src/plugins/dpdk/device/device.c
index cb0448fa503..806749ccb5d 100644
--- a/src/plugins/dpdk/device/device.c
+++ b/src/plugins/dpdk/device/device.c
@@ -50,8 +50,7 @@ dpdk_set_mac_address (vnet_hw_interface_t * hi,
dpdk_main_t *dm = &dpdk_main;
dpdk_device_t *xd = vec_elt_at_index (dm->devices, hi->dev_instance);
- error = rte_eth_dev_default_mac_addr_set (xd->port_id,
- (struct ether_addr *) address);
+ error = rte_eth_dev_default_mac_addr_set (xd->port_id, (void *) address);
if (error)
{
diff --git a/src/plugins/dpdk/device/init.c b/src/plugins/dpdk/device/init.c
index e5a796bdf9c..742fa6069a1 100644
--- a/src/plugins/dpdk/device/init.c
+++ b/src/plugins/dpdk/device/init.c
@@ -576,7 +576,7 @@ dpdk_lib_init (dpdk_main_t * dm)
addr[1] = 0xfe;
}
else
- rte_eth_macaddr_get (i, (struct ether_addr *) addr);
+ rte_eth_macaddr_get (i, (void *) addr);
if (xd->tx_q_used < tm->n_vlib_mains)
dpdk_device_lock_init (xd);