Commit bc0c6fab authored by Bruce Allan's avatar Bruce Allan Committed by Jeff Kirsher
Browse files

ice: Cleanup ice_tx_timeout() 



Clean up number of formatting issues and a comment that could use
clarification.

Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Signed-off-by: default avatarAnirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent e0c9fd9b

drivers/net/ethernet/intel/ice/ice_main.c

+9 −13
Original line number Diff line number Diff line
@@ -3702,35 +3702,31 @@ static void ice_tx_timeout(struct net_device *netdev) 


	pf->tx_timeout_count++;



	/* find the stopped queue the same way the stack does */

	/* find the stopped queue the same way dev_watchdog() does */

	for (i = 0; i < netdev->num_tx_queues; i++) {

		struct netdev_queue *q;

		unsigned long trans_start;

		struct netdev_queue *q;



		q = netdev_get_tx_queue(netdev, i);

		trans_start = q->trans_start;

		if (netif_xmit_stopped(q) &&

		    time_after(jiffies,

			       (trans_start + netdev->watchdog_timeo))) {

			       trans_start + netdev->watchdog_timeo)) {

			hung_queue = i;

			break;

		}

	}



	if (i == netdev->num_tx_queues) {

	if (i == netdev->num_tx_queues)

		netdev_info(netdev, "tx_timeout: no netdev hung queue found\n");

	} else {

	else

		/* now that we have an index, find the tx_ring struct */

		for (i = 0; i < vsi->num_txq; i++) {

			if (vsi->tx_rings[i] && vsi->tx_rings[i]->desc) {

				if (hung_queue ==

				    vsi->tx_rings[i]->q_index) {

		for (i = 0; i < vsi->num_txq; i++)

			if (vsi->tx_rings[i] && vsi->tx_rings[i]->desc)

				if (hung_queue == vsi->tx_rings[i]->q_index) {

					tx_ring = vsi->tx_rings[i];

					break;

				}

			}

		}

	}



	/* Reset recovery level if enough time has elapsed after last timeout.

	 * Also ensure no new reset action happens before next timeout period.

CRA Git | Maintained and supported by SUSTech CRA and CCSE