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:
authorRui Salvaterra <rsalvaterra@gmail.com>2021-07-19 09:59:05 +0100
committerDaniel Golle <daniel@makrotopia.org>2021-07-20 04:11:05 +0100
commita395cd00d23602bfa9c568593e7b9a8f5b258ab1 (patch)
tree2471cd3449250e6ddcde1fb7cb61553e7d48f68a /target/linux/generic/backport-5.10/604-v5.12-net-fix-hangup-on-napi_disable-for-threaded-napi.patch
parentaaf1028296f45120f8e95491d1c8094bc8e8b693 (diff)
downloadupstream-a395cd00d23602bfa9c568593e7b9a8f5b258ab1.tar.gz
upstream-a395cd00d23602bfa9c568593e7b9a8f5b258ab1.tar.bz2
upstream-a395cd00d23602bfa9c568593e7b9a8f5b258ab1.zip
kernel: bump 5.10 to 5.10.51
No deleted or manually refreshed patches. Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
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 0b7639af1c..5894099fff 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
-@@ -6970,7 +6970,7 @@ static int napi_thread_wait(struct napi_
+@@ -6977,7 +6977,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
-@@ -6988,6 +6988,7 @@ static int napi_thread_wait(struct napi_
+@@ -6995,6 +6995,7 @@ static int napi_thread_wait(struct napi_
set_current_state(TASK_INTERRUPTIBLE);
}
__set_current_state(TASK_RUNNING);