diff mbox

[dpdk-dev,v2,1/2] net/mlx5: fix socket connection return value

Message ID e4961b23833203acaaaaf52e5e67be543854d066.1525334236.git.shahafs@mellanox.com (mailing list archive)
State Accepted, archived
Delegated to: Shahaf Shuler
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Shahaf Shuler May 3, 2018, 7:59 a.m. UTC 
  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@mellanox.com>
Signed-off-by: Shahaf Shuler <shahafs@mellanox.com>
Acked-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>
---

On v2:
 - No change. 

---
 drivers/net/mlx5/mlx5.c        | 2 +-
 drivers/net/mlx5/mlx5_socket.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Shahaf Shuler May 3, 2018, 10:33 a.m. UTC | #1 
Thursday, May 3, 2018 11:00 AM, Shahaf Shuler:
> Subject: [dpdk-dev] [PATCH v2 1/2] 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 <yskoh@mellanox.com>
> Signed-off-by: Shahaf Shuler <shahafs@mellanox.com>
> Acked-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>
> ---
> 

Series applied to next-net-mlx with the DEBUG() comment fix. Thanks.
diff mbox

Patch

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);