s390/qeth: fix cancelling of TX timer on dev_close() (c649c41d) · Commits · 戴 / test

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: ("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>

drivers/s390/net/qeth_core_main.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -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);
		}

Admin message