aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-5.4/770-09-net-ethernet-mtk_eth_soc-only-read-the-full-rx-descr.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2021-06-05 01:08:30 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2021-06-06 17:54:51 +0200
commitb55d3d69044ae872c96b4b287b43a57c8e96e7cd (patch)
tree6935e8663945edd671781b43f4cbf376c20d2f7e /target/linux/generic/pending-5.4/770-09-net-ethernet-mtk_eth_soc-only-read-the-full-rx-descr.patch
parent1b27d89d4075a2be7cb8035fde04dd5bbe2c91a3 (diff)
downloadupstream-b55d3d69044ae872c96b4b287b43a57c8e96e7cd.tar.gz
upstream-b55d3d69044ae872c96b4b287b43a57c8e96e7cd.tar.bz2
upstream-b55d3d69044ae872c96b4b287b43a57c8e96e7cd.zip
kernel: bump 5.4 to 5.4.124
Manually rebased generic/hack-5.4/662-remove_pfifo_fast.patch ramips/patches-5.4/0048-asoc-add-mt7620-support.patch All others updated automatically. Compile-tested on: armvirt/64, x86/generic, ath79/generic, ramips/mt7621 Runtime-tested on: armvirt/64, x86/generic, ath79/generic Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/pending-5.4/770-09-net-ethernet-mtk_eth_soc-only-read-the-full-rx-descr.patch')
-rw-r--r--target/linux/generic/pending-5.4/770-09-net-ethernet-mtk_eth_soc-only-read-the-full-rx-descr.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/pending-5.4/770-09-net-ethernet-mtk_eth_soc-only-read-the-full-rx-descr.patch b/target/linux/generic/pending-5.4/770-09-net-ethernet-mtk_eth_soc-only-read-the-full-rx-descr.patch
index 1b7a0a9aca..c2f5013e26 100644
--- a/target/linux/generic/pending-5.4/770-09-net-ethernet-mtk_eth_soc-only-read-the-full-rx-descr.patch
+++ b/target/linux/generic/pending-5.4/770-09-net-ethernet-mtk_eth_soc-only-read-the-full-rx-descr.patch
@@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -772,13 +772,18 @@ static inline int mtk_max_buf_size(int f
+@@ -793,13 +793,18 @@ static inline int mtk_max_buf_size(int f
return buf_size;
}
@@ -32,7 +32,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
}
/* the qdma core needs scratch memory to be setup */
-@@ -1250,8 +1255,7 @@ static int mtk_poll_rx(struct napi_struc
+@@ -1271,8 +1276,7 @@ static int mtk_poll_rx(struct napi_struc
rxd = &ring->dma[idx];
data = ring->data[idx];