diff options
| author |   Julian Wiedmann <jwi@linux.ibm.com> | 2020-05-04 19:39:42 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-05-04 11:21:40 -0700 |
| commit | c649c41d5d0f7d153bd5d5d9c093fec16ee03e00 (patch) | |
| tree | 9e2568e215ceb8d10ec9c6913418828da361b1fd /drivers/s390 | |
| parent | net: enetc: fix an issue about leak system resources (diff) | |
| download | wireguard-linux-c649c41d5d0f7d153bd5d5d9c093fec16ee03e00.tar.xz wireguard-linux-c649c41d5d0f7d153bd5d5d9c093fec16ee03e00.zip | |
s390/qeth: fix cancelling of TX timer on dev_close()
With the introduction of TX coalescing, .ndo_start_xmit now potentially
starts the TX completion timer. So only kill the timer _after_ TX has
been disabled.
Fixes: ee1e52d1e4bb ("s390/qeth: add TX IRQ coalescing support for IQD devices")
Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/s390')
| -rw-r--r-- | drivers/s390/net/qeth_core_main.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c index f7689461c242..569966bdc513 100644 --- a/drivers/s390/net/qeth_core_main.c +++ b/drivers/s390/net/qeth_core_main.c @@ -6717,17 +6717,17 @@ int qeth_stop(struct net_device *dev) unsigned int i; /* Quiesce the NAPI instances: */ - qeth_for_each_output_queue(card, queue, i) { + qeth_for_each_output_queue(card, queue, i) napi_disable(&queue->napi); - del_timer_sync(&queue->timer); - } /* Stop .ndo_start_xmit, might still access queue->napi. */ netif_tx_disable(dev); - /* Queues may get re-allocated, so remove the NAPIs here. */ - qeth_for_each_output_queue(card, queue, i) + qeth_for_each_output_queue(card, queue, i) { + del_timer_sync(&queue->timer); + /* Queues may get re-allocated, so remove the NAPIs. */ netif_napi_del(&queue->napi); + } } else { netif_tx_disable(dev); } |