summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2020-07-03 21:46:40 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2020-07-05 15:02:47 +0200
commit0f07496f520cef7c58efe125d542cbc063bbc558 (patch)
tree8ef66ba2f34a3d081c788fa21d79b602f45f33f0 /target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch
parent1f8d9f70c259a5702c4a7646754ccad6add5d9ab (diff)
downloadopenwrt-0f07496f520cef7c58efe125d542cbc063bbc558.tar.gz
openwrt-0f07496f520cef7c58efe125d542cbc063bbc558.tar.bz2
openwrt-0f07496f520cef7c58efe125d542cbc063bbc558.zip
kernel: Update kernel 4.9 to version 4.9.229
Fixes: - CVE-2020-10757 Run tested: ar71xx Build tested: ar71xx Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
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 712348c835..8e3f76261e 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
@@ -657,7 +657,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
gfar_write(&regs->rstat, gfargrp->rstat);
--- a/drivers/net/ethernet/freescale/ucc_geth.c
+++ b/drivers/net/ethernet/freescale/ucc_geth.c
-@@ -3303,7 +3303,7 @@ static int ucc_geth_poll(struct napi_str
+@@ -3304,7 +3304,7 @@ static int ucc_geth_poll(struct napi_str
howmany += ucc_geth_rx(ugeth, i, budget - howmany);
if (howmany < budget) {
@@ -927,7 +927,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
}
--- a/drivers/net/ethernet/nxp/lpc_eth.c
+++ b/drivers/net/ethernet/nxp/lpc_eth.c
-@@ -999,7 +999,7 @@ static int lpc_eth_poll(struct napi_stru
+@@ -1000,7 +1000,7 @@ static int lpc_eth_poll(struct napi_stru
rx_done = __lpc_handle_recv(ndev, budget);
if (rx_done < budget) {