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

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
...@@ -3702,35 +3702,31 @@ static void ice_tx_timeout(struct net_device *netdev) ...@@ -3702,35 +3702,31 @@ static void ice_tx_timeout(struct net_device *netdev)
pf->tx_timeout_count++; 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++) { for (i = 0; i < netdev->num_tx_queues; i++) {
struct netdev_queue *q;
unsigned long trans_start; unsigned long trans_start;
struct netdev_queue *q;
q = netdev_get_tx_queue(netdev, i); q = netdev_get_tx_queue(netdev, i);
trans_start = q->trans_start; trans_start = q->trans_start;
if (netif_xmit_stopped(q) && if (netif_xmit_stopped(q) &&
time_after(jiffies, time_after(jiffies,
(trans_start + netdev->watchdog_timeo))) { trans_start + netdev->watchdog_timeo)) {
hung_queue = i; hung_queue = i;
break; break;
} }
} }
if (i == netdev->num_tx_queues) { if (i == netdev->num_tx_queues)
netdev_info(netdev, "tx_timeout: no netdev hung queue found\n"); netdev_info(netdev, "tx_timeout: no netdev hung queue found\n");
} else { else
/* now that we have an index, find the tx_ring struct */ /* now that we have an index, find the tx_ring struct */
for (i = 0; i < vsi->num_txq; i++) { for (i = 0; i < vsi->num_txq; i++)
if (vsi->tx_rings[i] && vsi->tx_rings[i]->desc) { if (vsi->tx_rings[i] && vsi->tx_rings[i]->desc)
if (hung_queue == if (hung_queue == vsi->tx_rings[i]->q_index) {
vsi->tx_rings[i]->q_index) {
tx_ring = vsi->tx_rings[i]; tx_ring = vsi->tx_rings[i];
break; break;
} }
}
}
}
/* Reset recovery level if enough time has elapsed after last timeout. /* Reset recovery level if enough time has elapsed after last timeout.
* Also ensure no new reset action happens before next timeout period. * Also ensure no new reset action happens before next timeout period.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment