[PATCH RFC v7 net-next 2/1] mlx4: use new txqueue timeout argument

From: Michael S. Tsirkin
Date: Tue Dec 03 2019 - 02:32:19 EST


Signed-off-by: Michael S. Tsirkin <mst@xxxxxxxxxx>
---

untested

drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
index d2728933d420..3bcf5f682af5 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
@@ -1363,15 +1363,9 @@ static void mlx4_en_tx_timeout(struct net_device *dev, unsigned int txqueue)
if (netif_msg_timer(priv))
en_warn(priv, "Tx timeout called on port:%d\n", priv->port);

- for (i = 0; i < priv->tx_ring_num[TX]; i++) {
- struct mlx4_en_tx_ring *tx_ring = priv->tx_ring[TX][i];
-
- if (!netif_tx_queue_stopped(netdev_get_tx_queue(dev, i)))
- continue;
- en_warn(priv, "TX timeout on queue: %d, QP: 0x%x, CQ: 0x%x, Cons: 0x%x, Prod: 0x%x\n",
- i, tx_ring->qpn, tx_ring->sp_cqn,
- tx_ring->cons, tx_ring->prod);
- }
+ en_warn(priv, "TX timeout on queue: %d, QP: 0x%x, CQ: 0x%x, Cons: 0x%x, Prod: 0x%x\n",
+ txqueue, tx_ring->qpn, tx_ring->sp_cqn,
+ tx_ring->cons, tx_ring->prod);

priv->port_stats.tx_timeout++;
en_dbg(DRV, priv, "Scheduling watchdog\n");
--
MST