Skip to content

Commit

Permalink
r8169: add support for xmit_more
Browse files Browse the repository at this point in the history
Delay update of hw tail descriptor if we know that another skb is going
to be sent.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Florian Westphal authored and David S. Miller committed Jan 9, 2015
1 parent 4a71d05 commit 0bec3b7
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions drivers/net/ethernet/realtek/r8169.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -7105,11 +7106,16 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb,

tp->cur_tx += frags + 1;

RTL_W8(TxPoll, NPQ);
stop_queue = !TX_FRAGS_READY_FOR(tp, MAX_SKB_FRAGS);

mmiowb();
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.
*/
Expand Down

0 comments on commit 0bec3b7

Please sign in to comment.