diff options
| author | David S. Miller <davem@davemloft.net> | 2019-12-12 21:39:14 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-12-12 21:39:14 -0800 |
| commit | 1f4782ae2457cdd5b0e4fa0c897b5c5883cc0392 (patch) | |
| tree | 84235470edbb86af88d575e9fb474ef86387e698 /drivers/net/ethernet/netronome | |
| parent | 355979decf07d77e9f1fa59233b1e60ae51e307a (diff) | |
| parent | d8968eda7fc433e553c3a9b482014d8493554729 (diff) | |
Merge branch 'netdev-ndo_tx_timeout-cleanup'
Michael S. Tsirkin says:
====================
netdev: ndo_tx_timeout cleanup
Yet another forward declaration I missed. Hopfully the last one ...
A bunch of drivers want to know which tx queue triggered a timeout,
and virtio wants to do the same.
We actually have the info to hand, let's just pass it on to drivers.
Note: tested with an experimental virtio patch by Julio.
That patch itself isn't ready yet though, so not included.
Other drivers compiled only.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/netronome')
| -rw-r--r-- | drivers/net/ethernet/netronome/nfp/nfp_net_common.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c index bcdcd6de7dea..d4eeb3b3cf35 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c @@ -1321,17 +1321,11 @@ nfp_net_tx_ring_reset(struct nfp_net_dp *dp, struct nfp_net_tx_ring *tx_ring) netdev_tx_reset_queue(nd_q); } -static void nfp_net_tx_timeout(struct net_device *netdev) +static void nfp_net_tx_timeout(struct net_device *netdev, unsigned int txqueue) { struct nfp_net *nn = netdev_priv(netdev); - int i; - for (i = 0; i < nn->dp.netdev->real_num_tx_queues; i++) { - if (!netif_tx_queue_stopped(netdev_get_tx_queue(netdev, i))) - continue; - nn_warn(nn, "TX timeout on ring: %d\n", i); - } - nn_warn(nn, "TX watchdog timeout\n"); + nn_warn(nn, "TX watchdog timeout on ring: %u\n", txqueue); } /* Receive processing |