[dpdk-stable] [PATCH v2 18/20] net/mlx5: fix socket connection return value

[Shahaf Shuler]

[ upstream commit 26cc18c3603789fb2030e2c108c5c6be2989b38f ]

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 <yskoh at mellanox.com>
Signed-off-by: Shahaf Shuler <shahafs at mellanox.com>
Acked-by: Nelio Laranjeiro <nelio.laranjeiro at 6wind.com>
---
 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 fad367e850..8d27c0ceba 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -735,7 +735,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 1c85f1ec95..d46028f970 100644
--- a/drivers/net/mlx5/mlx5_socket.c
+++ b/drivers/net/mlx5/mlx5_socket.c
@@ -275,7 +275,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.12.0