Commit 1a31ae00 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Paolo Abeni
Browse files

r8169: use new macro netif_subqueue_completed_wake in the tx cleanup path 



Use new net core macro netif_subqueue_completed_wake to simplify
the code of the tx cleanup path.

Reviewed-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 8624e9bb

drivers/net/ethernet/realtek/r8169_main.c

+4 −12
Original line number Diff line number Diff line
@@ -4371,20 +4371,12 @@ static void rtl_tx(struct net_device *dev, struct rtl8169_private *tp, 
	}



	if (tp->dirty_tx != dirty_tx) {

		netdev_completed_queue(dev, pkts_compl, bytes_compl);

		dev_sw_netstats_tx_add(dev, pkts_compl, bytes_compl);

		WRITE_ONCE(tp->dirty_tx, dirty_tx);



		/* Sync with rtl8169_start_xmit:

		 * - publish dirty_tx ring index (write barrier)

		 * - refresh cur_tx ring index and queue status (read barrier)

		 * May the current thread miss the stopped queue condition,

		 * a racing xmit thread can only have a right view of the

		 * ring status.

		 */

		smp_store_mb(tp->dirty_tx, dirty_tx);

		if (netif_queue_stopped(dev) &&

		    rtl_tx_slots_avail(tp) >= R8169_TX_START_THRS)

			netif_wake_queue(dev);

		netif_subqueue_completed_wake(dev, 0, pkts_compl, bytes_compl,

					      rtl_tx_slots_avail(tp),

					      R8169_TX_START_THRS);

		/*

		 * 8168 hack: TxPoll requests are lost when the Tx packets are

		 * too close. Let's kick an extra TxPoll request when a burst