[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Sun, 7 Jul 2019 14:52:53 +0300
From: Tariq Toukan <tariqt@...lanox.com>
To: "David S. Miller" <davem@...emloft.net>
Cc: netdev@...r.kernel.org, Eran Ben Elisha <eranbe@...lanox.com>,
ayal@...lanox.com, jiri@...lanox.com,
Saeed Mahameed <saeedm@...lanox.com>, moshe@...lanox.com,
Tariq Toukan <tariqt@...lanox.com>
Subject: [PATCH net-next 01/16] Revert "net/mlx5e: Fix mlx5e_tx_reporter_create return value"
From: Aya Levin <ayal@...lanox.com>
This reverts commit 2e5b0534622fa87fd570d54af2d01ce304b88077.
This commit was needed prior to commit f6b19b354d50 ("net: devlink:
select NET_DEVLINK from drivers") Then, reporter's pointer could have
been a NULL. But with NET_DEVLINK mandatory to MLX5_CORE in Kconfig,
pointer can only hold an error in bad path.
Signed-off-by: Aya Levin <ayal@...lanox.com>
Signed-off-by: Tariq Toukan <tariqt@...lanox.com>
---
drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c
index 476dd97f7f2f..24626bb55598 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c
@@ -302,7 +302,7 @@ int mlx5e_tx_reporter_create(struct mlx5e_priv *priv)
netdev_warn(priv->netdev,
"Failed to create tx reporter, err = %ld\n",
PTR_ERR(priv->tx_reporter));
- return IS_ERR_OR_NULL(priv->tx_reporter);
+ return PTR_ERR_OR_ZERO(priv->tx_reporter);
}
void mlx5e_tx_reporter_destroy(struct mlx5e_priv *priv)
--
1.8.3.1
Powered by blists - more mailing lists