From 93f15e3020f641feaa187ce3b7beb62c4cacae6b Mon Sep 17 00:00:00 2001 From: Ido Barnea Date: Wed, 8 Feb 2017 12:24:23 +0200 Subject: dpdk1702-rc3 upstream changes Signed-off-by: Ido Barnea --- src/dpdk/lib/librte_eal/common/include/rte_version.h | 2 +- src/dpdk/lib/librte_eal/linuxapp/eal/eal_pci_uio.c | 2 +- src/dpdk/lib/librte_eal/linuxapp/eal/eal_vfio_mp_sync.c | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src/dpdk/lib/librte_eal') diff --git a/src/dpdk/lib/librte_eal/common/include/rte_version.h b/src/dpdk/lib/librte_eal/common/include/rte_version.h index 76bfe601..7fcd1ffe 100644 --- a/src/dpdk/lib/librte_eal/common/include/rte_version.h +++ b/src/dpdk/lib/librte_eal/common/include/rte_version.h @@ -78,7 +78,7 @@ extern "C" { * 0-15 = release candidates * 16 = release */ -#define RTE_VER_RELEASE 2 +#define RTE_VER_RELEASE 3 /** * Macro to compute a version number usable for comparisons diff --git a/src/dpdk/lib/librte_eal/linuxapp/eal/eal_pci_uio.c b/src/dpdk/lib/librte_eal/linuxapp/eal/eal_pci_uio.c index 3e4ffb57..20a4a665 100644 --- a/src/dpdk/lib/librte_eal/linuxapp/eal/eal_pci_uio.c +++ b/src/dpdk/lib/librte_eal/linuxapp/eal/eal_pci_uio.c @@ -230,7 +230,7 @@ pci_uio_free_resource(struct rte_pci_device *dev, close(dev->intr_handle.uio_cfg_fd); dev->intr_handle.uio_cfg_fd = -1; } - if (dev->intr_handle.fd) { + if (dev->intr_handle.fd >= 0) { close(dev->intr_handle.fd); dev->intr_handle.fd = -1; dev->intr_handle.type = RTE_INTR_HANDLE_UNKNOWN; diff --git a/src/dpdk/lib/librte_eal/linuxapp/eal/eal_vfio_mp_sync.c b/src/dpdk/lib/librte_eal/linuxapp/eal/eal_vfio_mp_sync.c index 00cf919b..fb4a2f84 100644 --- a/src/dpdk/lib/librte_eal/linuxapp/eal/eal_vfio_mp_sync.c +++ b/src/dpdk/lib/librte_eal/linuxapp/eal/eal_vfio_mp_sync.c @@ -301,6 +301,7 @@ vfio_mp_sync_thread(void __rte_unused * arg) vfio_mp_sync_send_request(conn_sock, SOCKET_ERR); else vfio_mp_sync_send_fd(conn_sock, fd); + close(fd); break; case SOCKET_REQ_GROUP: /* wait for group number */ -- cgit 1.2.3-korg