aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch
diff options
context:
space:
mode:
authorStijn Tintel <stijn@linux-ipv6.be>2018-02-18 01:43:25 +0100
committerStijn Tintel <stijn@linux-ipv6.be>2018-02-18 02:59:57 +0100
commitf621b539512e5b6c83dd2de1bc2dba06e40cd7ea (patch)
tree0031132613ec4876d3719afab772e3cb4caec4ab /target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch
parent1c308bbbf598e09e463f67686ff4b7dafcb98ae6 (diff)
downloadupstream-f621b539512e5b6c83dd2de1bc2dba06e40cd7ea.tar.gz
upstream-f621b539512e5b6c83dd2de1bc2dba06e40cd7ea.tar.bz2
upstream-f621b539512e5b6c83dd2de1bc2dba06e40cd7ea.zip
kernel: bump 4.9 to 4.9.82
Refresh patches. Remove upstreamed patches: - ar7/002-MIPS-AR7-ensure-the-port-type-s-FCR-value-is-used.patch - backport/040-crypto-fix-typo-in-KPP-dependency-of-CRYPTO_ECDH.patch Remove layerscape/819-Revert-dmaengine-dmatest-move-callback-wait-queue-to.patch, it is superseded by upstream commit 297c7cc4b5651b174a62925b6c961085f04979fd. Remove pending/650-pppoe_header_pad.patch, it is superseded by upstream commit 1bd21b158e07e0b8c5a2ce832305a0ebfe42c480. Update patches that no longer apply: - ar71xx/004-register_gpio_driver_earlier.patch - hack/204-module_strip.patch - pending/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch Fixes CVE-2017-8824. Compile-tested: ar71xx. Runtime-tested: ar71xx. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch')
-rw-r--r--target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch b/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch
index 5c6e334b19..d68670e219 100644
--- a/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch
+++ b/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch
@@ -1040,7 +1040,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
writel(irq->mask, adpt->base + EMAC_INT_MASK);
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
-@@ -7579,7 +7579,7 @@ static int rtl8169_poll(struct napi_stru
+@@ -7574,7 +7574,7 @@ static int rtl8169_poll(struct napi_stru
}
if (work_done < budget) {
@@ -1379,7 +1379,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
*/
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
-@@ -1059,7 +1059,7 @@ err:
+@@ -1061,7 +1061,7 @@ err:
if (work_done < budget) {
int more_to_do = 0;