aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-5.10/604-v5.12-net-fix-hangup-on-napi_disable-for-threaded-napi.patch
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2023-03-12 10:03:16 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2023-03-20 22:44:28 +0100
commitd4aad642ff80750ec16a58058eb6da718e2129cd (patch)
tree63cca16405ef64be4b8e67227d190285c22b5e94 /target/linux/generic/backport-5.10/604-v5.12-net-fix-hangup-on-napi_disable-for-threaded-napi.patch
parentbd2103e9bc6b4c1787baa03f51c83619bf4b9ec0 (diff)
downloadupstream-d4aad642ff80750ec16a58058eb6da718e2129cd.tar.gz
upstream-d4aad642ff80750ec16a58058eb6da718e2129cd.tar.bz2
upstream-d4aad642ff80750ec16a58058eb6da718e2129cd.zip
kernel: bump 5.10 to 5.10.173
Manually rebased: ramips/patches-5.10/810-uvc-add-iPassion-iP2970-support.patch All other patches automatically rebased. Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux/generic/backport-5.10/604-v5.12-net-fix-hangup-on-napi_disable-for-threaded-napi.patch')
-rw-r--r--target/linux/generic/backport-5.10/604-v5.12-net-fix-hangup-on-napi_disable-for-threaded-napi.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/backport-5.10/604-v5.12-net-fix-hangup-on-napi_disable-for-threaded-napi.patch b/target/linux/generic/backport-5.10/604-v5.12-net-fix-hangup-on-napi_disable-for-threaded-napi.patch
index 674f66e732..90d55162b8 100644
--- a/target/linux/generic/backport-5.10/604-v5.12-net-fix-hangup-on-napi_disable-for-threaded-napi.patch
+++ b/target/linux/generic/backport-5.10/604-v5.12-net-fix-hangup-on-napi_disable-for-threaded-napi.patch
@@ -34,7 +34,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
--- a/net/core/dev.c
+++ b/net/core/dev.c
-@@ -7008,7 +7008,7 @@ static int napi_thread_wait(struct napi_
+@@ -7010,7 +7010,7 @@ static int napi_thread_wait(struct napi_
set_current_state(TASK_INTERRUPTIBLE);
@@ -43,7 +43,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
/* Testing SCHED_THREADED bit here to make sure the current
* kthread owns this napi and could poll on this napi.
* Testing SCHED bit is not enough because SCHED bit might be
-@@ -7026,6 +7026,7 @@ static int napi_thread_wait(struct napi_
+@@ -7028,6 +7028,7 @@ static int napi_thread_wait(struct napi_
set_current_state(TASK_INTERRUPTIBLE);
}
__set_current_state(TASK_RUNNING);