patches for DPDK stable branches
 help / color / mirror / Atom feed
* [dpdk-stable] [PATCH 1/2] net/mlx4: fix returned values upon failed probing
@ 2017-03-27 14:17 Gaetan Rivet
  2017-03-27 14:17 ` [dpdk-stable] [PATCH 2/2] net/mlx5: " Gaetan Rivet
                   ` (3 more replies)
  0 siblings, 4 replies; 7+ messages in thread
From: Gaetan Rivet @ 2017-03-27 14:17 UTC (permalink / raw)
  To: dev; +Cc: stable

Let error messages in place, but return unambiguous values upon
probing errors.

Fixes: 66e1591687ac ("mlx4: avoid init errors when kernel modules are not loaded")
Cc: stable@dpdk.org

Signed-off-by: Gaetan Rivet <gaetan.rivet@6wind.com>
Acked-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>
---
 drivers/net/mlx4/mlx4.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c
index 665d8f7..24166c9 100644
--- a/drivers/net/mlx4/mlx4.c
+++ b/drivers/net/mlx4/mlx4.c
@@ -5706,10 +5706,8 @@ mlx4_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
 	list = ibv_exp_get_device_list(&i);
 	if (list == NULL) {
 		assert(errno);
-		if (errno == ENOSYS) {
-			WARN("cannot list devices, is ib_uverbs loaded?");
-			return 0;
-		}
+		if (errno == ENOSYS)
+			ERROR("cannot list devices, is ib_uverbs loaded?");
 		return -errno;
 	}
 	assert(i >= 0);
@@ -5741,11 +5739,11 @@ mlx4_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
 		ibv_free_device_list(list);
 		switch (err) {
 		case 0:
-			WARN("cannot access device, is mlx4_ib loaded?");
-			return 0;
+			ERROR("cannot access device, is mlx4_ib loaded?");
+			return -ENODEV;
 		case EINVAL:
-			WARN("cannot use device, are drivers up to date?");
-			return 0;
+			ERROR("cannot use device, are drivers up to date?");
+			return -EINVAL;
 		}
 		assert(err > 0);
 		return -err;
-- 
2.1.4

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2017-04-19 15:58 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-27 14:17 [dpdk-stable] [PATCH 1/2] net/mlx4: fix returned values upon failed probing Gaetan Rivet
2017-03-27 14:17 ` [dpdk-stable] [PATCH 2/2] net/mlx5: " Gaetan Rivet
2017-03-28 10:15 ` [dpdk-stable] [PATCH 1/2] net/mlx4: " Ferruh Yigit
2017-03-28 14:14   ` Gaëtan Rivet
2017-03-28 14:13 ` [dpdk-stable] [PATCH v2 " Gaetan Rivet
2017-04-19 15:58   ` Ferruh Yigit
2017-03-28 14:13 ` [dpdk-stable] [PATCH v2 2/2] net/mlx5: " Gaetan Rivet

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).