Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0bec3b70 authored by Florian Westphal's avatar Florian Westphal Committed by David S. Miller
Browse files

r8169: add support for xmit_more 



Delay update of hw tail descriptor if we know that another skb is going
to be sent.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4a71d054

drivers/net/ethernet/realtek/r8169.c

+9 −3
Original line number Diff line number Diff line
@@ -7049,6 +7049,7 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb, 
	u32 status, len;

	u32 opts[2];

	int frags;

	bool stop_queue;



	if (unlikely(!TX_FRAGS_READY_FOR(tp, skb_shinfo(skb)->nr_frags))) {

		netif_err(tp, drv, dev, "BUG! Tx Ring full when queue awake!\n");
@@ -7105,11 +7106,16 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb, 


	tp->cur_tx += frags + 1;



	stop_queue = !TX_FRAGS_READY_FOR(tp, MAX_SKB_FRAGS);



	if (!skb->xmit_more || stop_queue ||

	    netif_xmit_stopped(netdev_get_tx_queue(dev, 0))) {

		RTL_W8(TxPoll, NPQ);



		mmiowb();

	}



	if (!TX_FRAGS_READY_FOR(tp, MAX_SKB_FRAGS)) {

	if (stop_queue) {

		/* Avoid wrongly optimistic queue wake-up: rtl_tx thread must

		 * not miss a ring update when it notices a stopped queue.

		 */