From eac9cd58dec1b08d241657b1a81deebed9d4db9d Mon Sep 17 00:00:00 2001 From: Shahaf Shuler Date: Thu, 3 May 2018 10:59:36 +0300 Subject: [PATCH] net/mlx5: fix socket connection return value Upon success, mlx5_socket_connect should return the fd descriptor of the primary process Fixes: a6d83b6a9209 ("net/mlx5: standardize on negative errno values") Signed-off-by: Yongseok Koh Signed-off-by: Shahaf Shuler Acked-by: Nelio Laranjeiro --- drivers/net/mlx5/mlx5.c | 2 +- drivers/net/mlx5/mlx5_socket.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index 8f983061a0..46cb370a29 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -804,7 +804,7 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, goto error; /* Receive command fd from primary process */ err = mlx5_socket_connect(eth_dev); - if (err) + if (err < 0) goto error; /* Remap UAR for Tx queues. */ err = mlx5_tx_uar_remap(eth_dev, err); diff --git a/drivers/net/mlx5/mlx5_socket.c b/drivers/net/mlx5/mlx5_socket.c index e12c4cb2e1..99297d5c43 100644 --- a/drivers/net/mlx5/mlx5_socket.c +++ b/drivers/net/mlx5/mlx5_socket.c @@ -294,7 +294,7 @@ mlx5_socket_connect(struct rte_eth_dev *dev) } ret = *fd; close(socket_fd); - return 0; + return ret; error: if (socket_fd != -1) close(socket_fd); -- 2.20.1