aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips/patches-5.4
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2020-09-10 15:17:13 -0400
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-09-12 01:28:50 +0200
commitbee76f1bfa13a1dad8706090a5b6a1dd36f3d9c1 (patch)
treeba288a8a4922007a82ede6b45292c88154044914 /target/linux/ramips/patches-5.4
parentc4110a524e9a026cf570b6dadf325c037b7527d0 (diff)
downloadupstream-bee76f1bfa13a1dad8706090a5b6a1dd36f3d9c1.tar.gz
upstream-bee76f1bfa13a1dad8706090a5b6a1dd36f3d9c1.tar.bz2
upstream-bee76f1bfa13a1dad8706090a5b6a1dd36f3d9c1.zip
kernel: bump 5.4 to 5.4.64
Remove upstreamed patches: generic-backport 701-v5.5-net-core-use-listified-Rx-for-GRO_NORMAL-in-napi_gro.patch Manually merged: mediatek/patches-5.4 0603-net-dsa-mt7530-Extend-device-data-ready-for-adding-a.patch All other modifications made by update_kernel.sh Build-tested: ipq806x, lantiq/xrx200, mvebu, x86/64 Run-tested: ipq806x (R7800), mvebu (mamba, rango), lantiq/xrx200 (Easybox 904 xDSL), x86/64 No dmesg regressions, everything functional Signed-off-by: John Audia <graysky@archlinux.us> [add community build/run tests to commit message] Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/ramips/patches-5.4')
-rw-r--r--target/linux/ramips/patches-5.4/401-net-ethernet-mediatek-support-net-labels.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ramips/patches-5.4/401-net-ethernet-mediatek-support-net-labels.patch b/target/linux/ramips/patches-5.4/401-net-ethernet-mediatek-support-net-labels.patch
index d7c0df6046..00e48fe662 100644
--- a/target/linux/ramips/patches-5.4/401-net-ethernet-mediatek-support-net-labels.patch
+++ b/target/linux/ramips/patches-5.4/401-net-ethernet-mediatek-support-net-labels.patch
@@ -14,7 +14,7 @@ Signed-off-by: René van Dorst <opensource@vdorst.com>
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -2860,6 +2860,7 @@ static const struct net_device_ops mtk_n
+@@ -2863,6 +2863,7 @@ static const struct net_device_ops mtk_n
static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np)
{
@@ -22,7 +22,7 @@ Signed-off-by: René van Dorst <opensource@vdorst.com>
const __be32 *_id = of_get_property(np, "reg", NULL);
struct phylink *phylink;
int phy_mode, id, err;
-@@ -2952,6 +2953,9 @@ static int mtk_add_mac(struct mtk_eth *e
+@@ -2955,6 +2956,9 @@ static int mtk_add_mac(struct mtk_eth *e
eth->netdev[id]->max_mtu = MTK_MAX_RX_LENGTH - MTK_RX_ETH_HLEN;