This is a note to let you know that I've just added the patch titled
r8152: check rx after napi is enabled
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-check-rx-after-napi-is-enabled.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 <stable@xxxxxxxxxxxxxxx> know about it.
>From foo@baz Thu Jun 15 15:00:53 CEST 2017
From: hayeswang <hayeswang@xxxxxxxxxxx>
Date: Thu, 26 Jan 2017 09:38:34 +0800
Subject: r8152: check rx after napi is enabled
From: hayeswang <hayeswang@xxxxxxxxxxx>
[ Upstream commit 7489bdadb7d17d3c81e39b85688500f700beb790 ]
Schedule the napi after napi_enable() for rx, if it is necessary.
If the rx is completed when napi is disabled, the sheduling of napi
would be lost. Then, no one handles the rx packet until next napi
is scheduled.
Signed-off-by: Hayes Wang <hayeswang@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Sasha Levin <alexander.levin@xxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/net/usb/r8152.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -32,7 +32,7 @@
#define NETNEXT_VERSION "08"
/* Information for net */
-#define NET_VERSION "7"
+#define NET_VERSION "8"
#define DRIVER_VERSION "v1." NETNEXT_VERSION "." NET_VERSION
#define DRIVER_AUTHOR "Realtek linux nic maintainers <nic_swsd@xxxxxxxxxxx>"
@@ -3552,6 +3552,9 @@ static int rtl8152_post_reset(struct usb
napi_enable(&tp->napi);
+ if (!list_empty(&tp->rx_done))
+ napi_schedule(&tp->napi);
+
return 0;
}
@@ -3691,6 +3694,8 @@ static int rtl8152_resume(struct usb_int
napi_enable(&tp->napi);
clear_bit(SELECTIVE_SUSPEND, &tp->flags);
smp_mb__after_atomic();
+ if (!list_empty(&tp->rx_done))
+ napi_schedule(&tp->napi);
} else {
tp->rtl_ops.up(tp);
netif_carrier_off(tp->netdev);
Patches currently in stable-queue which might be from hayeswang@xxxxxxxxxxx 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