| Message ID | 20191203072757.429125-2-mst@redhat.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | None | expand |
On Tue, 3 Dec 2019 02:32:14 -0500, Michael S. Tsirkin wrote: > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > --- > > untested > > drivers/net/ethernet/netronome/nfp/nfp_net_common.c | 7 +------ > 1 file changed, 1 insertion(+), 6 deletions(-) > > diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c > index 41a808b14d76..26f1fb19d0aa 100644 > --- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c > +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c > @@ -1323,13 +1323,8 @@ nfp_net_tx_ring_reset(struct nfp_net_dp *dp, struct nfp_net_tx_ring *tx_ring) > 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 timeout on ring: %d\n", txqueue); %u > nn_warn(nn, "TX watchdog timeout\n"); I think we can drop this warning now. With that: Acked-by: Jakub Kicinski <jakub.kicinski@netronome.com> Thanks!
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c index 41a808b14d76..26f1fb19d0aa 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c @@ -1323,13 +1323,8 @@ nfp_net_tx_ring_reset(struct nfp_net_dp *dp, struct nfp_net_tx_ring *tx_ring) 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 timeout on ring: %d\n", txqueue); nn_warn(nn, "TX watchdog timeout\n"); }
Signed-off-by: Michael S. Tsirkin <mst@redhat.com> --- untested drivers/net/ethernet/netronome/nfp/nfp_net_common.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)