[dpdk-dev,1/2] net/mlx4: fix returned values upon failed probing
Checks
Commit Message
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(-)
Comments
On 3/27/2017 3:17 PM, Gaetan Rivet wrote:
> 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>
Hi Gaetan,
I am getting merge conflict in this patch, can you please rebase it on
top of latest next-net?
Thanks,
ferruh
Hi Ferruh,
On Tue, Mar 28, 2017 at 11:15:42AM +0100, Ferruh Yigit wrote:
>On 3/27/2017 3:17 PM, Gaetan Rivet wrote:
>> 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>
>
>Hi Gaetan,
>
>I am getting merge conflict in this patch, can you please rebase it on
>top of latest next-net?
>
Here: http://dpdk.org/ml/archives/dev/2017-March/061871.html
>Thanks,
>ferruh
>
>
@@ -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;