From 706a4ec40cce108f484b40805bfa48619a0a7f09 Mon Sep 17 00:00:00 2001 From: John Audia Date: Sat, 11 Jun 2022 08:50:59 -0400 Subject: kernel: bump 5.10 to 5.10.121 Manually rebased: oxnas/patches-5.10/100-oxnas-clk-plla-pllb.patch All other patches automatically rebased. Build system: x86_64 Build-tested: ipq806x/R7800 Signed-off-by: John Audia --- ...v5.12-net-fix-race-between-napi-kthread-mode-and-busy-poll.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'target/linux/generic/backport-5.10/603-v5.12-net-fix-race-between-napi-kthread-mode-and-busy-poll.patch') 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 febef3e28a..a66198ac80 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 @@ -45,7 +45,7 @@ Cc: Hannes Frederic Sowa enum gro_result { --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -4300,6 +4300,8 @@ static inline void ____napi_schedule(str +@@ -4304,6 +4304,8 @@ static inline void ____napi_schedule(str */ thread = READ_ONCE(napi->thread); if (thread) { @@ -54,7 +54,7 @@ Cc: Hannes Frederic Sowa wake_up_process(thread); return; } -@@ -6560,7 +6562,8 @@ bool napi_complete_done(struct napi_stru +@@ -6564,7 +6566,8 @@ bool napi_complete_done(struct napi_stru WARN_ON_ONCE(!(val & NAPIF_STATE_SCHED)); @@ -64,7 +64,7 @@ Cc: Hannes Frederic Sowa /* If STATE_MISSED was set, leave STATE_SCHED set, * because we will call napi->poll() one more time. -@@ -6996,16 +6999,25 @@ static int napi_poll(struct napi_struct +@@ -7000,16 +7003,25 @@ static int napi_poll(struct napi_struct static int napi_thread_wait(struct napi_struct *napi) { -- cgit v1.2.3