diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2021-06-05 01:08:30 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-06-06 17:54:51 +0200 |
commit | b55d3d69044ae872c96b4b287b43a57c8e96e7cd (patch) | |
tree | 6935e8663945edd671781b43f4cbf376c20d2f7e /target/linux/ramips/patches-5.4/401-net-ethernet-mediatek-support-net-labels.patch | |
parent | 1b27d89d4075a2be7cb8035fde04dd5bbe2c91a3 (diff) | |
download | upstream-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/ramips/patches-5.4/401-net-ethernet-mediatek-support-net-labels.patch')
-rw-r--r-- | target/linux/ramips/patches-5.4/401-net-ethernet-mediatek-support-net-labels.patch | 4 |
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 6583fca60b..b011b140c7 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 -@@ -2922,6 +2922,7 @@ static const struct net_device_ops mtk_n +@@ -2943,6 +2943,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; -@@ -3014,6 +3015,9 @@ static int mtk_add_mac(struct mtk_eth *e +@@ -3035,6 +3036,9 @@ static int mtk_add_mac(struct mtk_eth *e eth->netdev[id]->max_mtu = MTK_MAX_RX_LENGTH - MTK_RX_ETH_HLEN; |