[dpdk-stable] patch 'net/mlx4: fix returned values upon failed probing' has been queued to LTS release 16.11.2
Yuanhan Liu
yuanhan.liu at linux.intel.com
Fri Apr 7 10:11:48 CEST 2017
Hi,
FYI, your patch has been queued to LTS release 16.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable
yet. It will be pushed if I get no objections before 04/11/17.
So please shout if anyone has objections.
Thanks.
--yliu
---
>From 8ba039e25b3486a4a915cee32b0ec2365e5e54bb Mon Sep 17 00:00:00 2001
From: Gaetan Rivet <gaetan.rivet at 6wind.com>
Date: Tue, 28 Mar 2017 16:13:11 +0200
Subject: [PATCH] net/mlx4: fix returned values upon failed probing
[ upstream commit 9e09761b43179caa3bc825a83b18e3b27ddf7f10 ]
Let error messages in place, but return unambiguous values upon
probing errors.
Fixes: 66e1591687ac ("mlx4: avoid init errors when kernel modules are not loaded")
Signed-off-by: Gaetan Rivet <gaetan.rivet at 6wind.com>
Acked-by: Adrien Mazarguil <adrien.mazarguil at 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 262277f..695efe3 100644
--- a/drivers/net/mlx4/mlx4.c
+++ b/drivers/net/mlx4/mlx4.c
@@ -5571,10 +5571,8 @@ mlx4_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
list = ibv_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);
@@ -5606,11 +5604,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;
--
1.9.0
More information about the stable
mailing list