Commit 3d5971ec authored by Jim Harris's avatar Jim Harris Committed by Tomasz Zawadzki
Browse files

env_dpdk: do not use rte_version_xxx() variants 



These variants did not exist in DPDK 20.11 which is
still supported by SPDK.

So we will instead need to scan the rte_version()
string to get these values.

Fixes issue #2715.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: I79657002a7a605a38a0d98b944ac53c02fa6d78c
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/14661


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarPawel Piatek <pawelx.piatek@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
parent 896a25fb

lib/env_dpdk/pci_dpdk.c

+10 −3
Original line number Diff line number Diff line
@@ -15,9 +15,16 @@ static struct dpdk_fn_table *g_dpdk_fn_table; 
int

dpdk_pci_init(void)

{

	uint32_t year = rte_version_year();

	uint32_t month = rte_version_month();

	uint32_t minor = rte_version_minor();

	uint32_t year;

	uint32_t month;

	uint32_t minor;

	int count;



	count = sscanf(rte_version(), "DPDK %u.%u.%u", &year, &month, &minor);

	if (count != 3) {

		SPDK_ERRLOG("Unrecognized DPDK version format '%s'\n", rte_version());

		return -EINVAL;

	}



	/* Anything 23.x or higher is not supported. */

	if (year > 22) {