aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-5.4
diff options
context:
space:
mode:
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-08-21 18:16:42 +0200
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-08-24 17:33:58 +0200
commit36aa27189ad9845481c373b030d0f6196e390c67 (patch)
treee41f764fabafd0f4a2279c8d4409e549c62ffbf0 /target/linux/generic/pending-5.4
parentbf96eb55c82191701030b68810e6f19adbb91eeb (diff)
downloadupstream-36aa27189ad9845481c373b030d0f6196e390c67.tar.gz
upstream-36aa27189ad9845481c373b030d0f6196e390c67.tar.bz2
upstream-36aa27189ad9845481c373b030d0f6196e390c67.zip
kernel: bump 5.4 to 5.4.60
Deleted upstream patches: generic: 041-genirq-affinity-Make-affinity-setting-if-activated-o.patch ipq806x: 093-5-v5.8-ipq806x-PCI-qcom-Define-some-PARF-params-needed-for-ipq8064-SoC.patch 093-6-v5.8-ipq806x-PCI-qcom-Add-support-for-tx-term-offset-for-rev-2_1_0.patch Merged manually: ipq806x: 093-4-v5.8-ipq806x-PCI-qcom-Use-bulk-clk-api-and-assert-on-error.patch layerscape: 804-crypto-0016-MLKU-114-1-crypto-caam-reduce-page-0-regs-access-to-.patch Build-tested: ath79/generic, ipq806x, layerscape/armv7, layerscape/armv8_64b Run-tested: ipq806x (R7800) Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/generic/pending-5.4')
-rw-r--r--target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch b/target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch
index 0fd837d45e..2544645809 100644
--- a/target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch
+++ b/target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch
@@ -226,7 +226,8 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
have = netpoll_poll_lock(n);
- weight = n->weight;
--
++ work = __napi_poll(n, &do_repoll);
+
- /* This NAPI_STATE_SCHED test is for avoiding a race
- * with netpoll's poll_napi(). Only the entity which
- * obtains the lock and sees NAPI_STATE_SCHED set will
@@ -243,8 +244,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
-
- if (likely(work < weight))
- goto out_unlock;
-+ work = __napi_poll(n, &do_repoll);
-
+-
- /* Drivers must not modify the NAPI state if they
- * consume the entire weight. In such cases this code
- * still "owns" the NAPI instance and therefore can