aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-5.10/603-v5.12-net-fix-race-between-napi-kthread-mode-and-busy-poll.patch
diff options
context:
space:
mode:
authorRui Salvaterra <rsalvaterra@gmail.com>2021-07-28 15:53:41 +0100
committerDaniel Golle <daniel@makrotopia.org>2021-07-29 19:50:16 +0100
commita20e6149b3aceaf9c5ded756ec6665d3866f640e (patch)
treee9930d35d52e5f5e65e7202c2325d3f243f4ae97 /target/linux/generic/backport-5.10/603-v5.12-net-fix-race-between-napi-kthread-mode-and-busy-poll.patch
parentf2961c9c2be6873536fc68bed4bf2da6f3746c98 (diff)
downloadupstream-a20e6149b3aceaf9c5ded756ec6665d3866f640e.tar.gz
upstream-a20e6149b3aceaf9c5ded756ec6665d3866f640e.tar.bz2
upstream-a20e6149b3aceaf9c5ded756ec6665d3866f640e.zip
kernel: bump 5.10 to 5.10.54
Deleted (upstreamed) patches: mediatek/patches-5.10/000-spi-fix-fifo.patch Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Diffstat (limited to 'target/linux/generic/backport-5.10/603-v5.12-net-fix-race-between-napi-kthread-mode-and-busy-poll.patch')
-rw-r--r--target/linux/generic/backport-5.10/603-v5.12-net-fix-race-between-napi-kthread-mode-and-busy-poll.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/backport-5.10/603-v5.12-net-fix-race-between-napi-kthread-mode-and-busy-poll.patch b/target/linux/generic/backport-5.10/603-v5.12-net-fix-race-between-napi-kthread-mode-and-busy-poll.patch
index cdab47e0cc..a7fe9b360f 100644
--- a/target/linux/generic/backport-5.10/603-v5.12-net-fix-race-between-napi-kthread-mode-and-busy-poll.patch
+++ b/target/linux/generic/backport-5.10/603-v5.12-net-fix-race-between-napi-kthread-mode-and-busy-poll.patch
@@ -54,7 +54,7 @@ Cc: Hannes Frederic Sowa <hannes@stressinduktion.org>
wake_up_process(thread);
return;
}
-@@ -6534,7 +6536,8 @@ bool napi_complete_done(struct napi_stru
+@@ -6548,7 +6550,8 @@ bool napi_complete_done(struct napi_stru
WARN_ON_ONCE(!(val & NAPIF_STATE_SCHED));
@@ -64,7 +64,7 @@ Cc: Hannes Frederic Sowa <hannes@stressinduktion.org>
/* If STATE_MISSED was set, leave STATE_SCHED set,
* because we will call napi->poll() one more time.
-@@ -6970,16 +6973,25 @@ static int napi_poll(struct napi_struct
+@@ -6984,16 +6987,25 @@ static int napi_poll(struct napi_struct
static int napi_thread_wait(struct napi_struct *napi)
{