aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaeed Mahameed <saeedm@mellanox.com>2018-02-01 08:37:44 -0500
committerSaeed Mahameed <saeedm@mellanox.com>2018-03-30 19:16:17 -0400
commit7b2117bb8ff98b7b82543f77768dfe7aca7e3746 (patch)
tree92f57d2690fd08b11273f78c82a4027dd7bb9cde
parentc0b6edef0bf0e33c12eaf80c676ff09def011518 (diff)
net/mlx5e: Use eq ptr from cq
Instead of looking for the EQ of the CQ, remove that redundant code and use the eq pointer stored in the cq struct. Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
-rw-r--r--drivers/net/ethernet/mellanox/mlx5/core/en_main.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index 1b48dec67abf..2aff4db9bdaa 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -3728,21 +3728,11 @@ static netdev_features_t mlx5e_features_check(struct sk_buff *skb,
3728static bool mlx5e_tx_timeout_eq_recover(struct net_device *dev, 3728static bool mlx5e_tx_timeout_eq_recover(struct net_device *dev,
3729 struct mlx5e_txqsq *sq) 3729 struct mlx5e_txqsq *sq)
3730{ 3730{
3731 struct mlx5e_priv *priv = netdev_priv(dev); 3731 struct mlx5_eq *eq = sq->cq.mcq.eq;
3732 struct mlx5_core_dev *mdev = priv->mdev;
3733 int irqn_not_used, eqn;
3734 struct mlx5_eq *eq;
3735 u32 eqe_count; 3732 u32 eqe_count;
3736 3733
3737 if (mlx5_vector2eqn(mdev, sq->cq.mcq.vector, &eqn, &irqn_not_used))
3738 return false;
3739
3740 eq = mlx5_eqn2eq(mdev, eqn);
3741 if (IS_ERR(eq))
3742 return false;
3743
3744 netdev_err(dev, "EQ 0x%x: Cons = 0x%x, irqn = 0x%x\n", 3734 netdev_err(dev, "EQ 0x%x: Cons = 0x%x, irqn = 0x%x\n",
3745 eqn, eq->cons_index, eq->irqn); 3735 eq->eqn, eq->cons_index, eq->irqn);
3746 3736
3747 eqe_count = mlx5_eq_poll_irq_disabled(eq); 3737 eqe_count = mlx5_eq_poll_irq_disabled(eq);
3748 if (!eqe_count) 3738 if (!eqe_count)