Patch "r8152: re-schedule napi for tx" has been added to the 4.9-stable tree

From: <gregkh@linuxfoundation.org>
Date: 2017-06-15 13:04:25

This is a note to let you know that I've just added the patch titled

    r8152: re-schedule napi for tx

to the 4.9-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     r8152-re-schedule-napi-for-tx.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let [off-list ref] know about it.

From foo@baz Thu Jun 15 15:00:53 CEST 2017
From: hayeswang <redacted>
Date: Thu, 26 Jan 2017 09:38:33 +0800
Subject: r8152: re-schedule napi for tx

From: hayeswang <redacted>


[ Upstream commit 248b213ad908b88db15941202ef7cb7eb137c1a0 ]

Re-schedule napi after napi_complete() for tx, if it is necessay.

In r8152_poll(), if the tx is completed after tx_bottom() and before
napi_complete(), the scheduling of napi would be lost. Then, no
one handles the next tx until the next napi_schedule() is called.

Signed-off-by: Hayes Wang <redacted>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <redacted>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/net/usb/r8152.c |    3 +++
 1 file changed, 3 insertions(+)
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -1936,6 +1936,9 @@ static int r8152_poll(struct napi_struct
 		napi_complete(napi);
 		if (!list_empty(&tp->rx_done))
 			napi_schedule(napi);
+		else if (!skb_queue_empty(&tp->tx_queue) &&
+			 !list_empty(&tp->tx_free))
+			napi_schedule(napi);
 	}
 
 	return work_done;

Patches currently in stable-queue which might be from hayeswang@realtek.com are

queue-4.9/r8152-fix-rtl8152_post_reset-function.patch
queue-4.9/r8152-re-schedule-napi-for-tx.patch
queue-4.9/r8152-avoid-start_xmit-to-call-napi_schedule-during-autosuspend.patch
queue-4.9/r8152-check-rx-after-napi-is-enabled.patch
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help