aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2020-09-05 13:43:41 -0400
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-09-06 19:55:19 +0200
commit2c2fcbd2e0f856f460040b8c67530ca27fa323e7 (patch)
tree1bb399fe95e81ae6961dfa6ccfc88bf99fd7561b /target/linux/ramips
parentad22f6a8aae42131cadb06091c11f27571a2ce92 (diff)
downloadupstream-2c2fcbd2e0f856f460040b8c67530ca27fa323e7.tar.gz
upstream-2c2fcbd2e0f856f460040b8c67530ca27fa323e7.tar.bz2
upstream-2c2fcbd2e0f856f460040b8c67530ca27fa323e7.zip
kernel: bump 5.4 to 5.4.63
Manually merged: hack-5.4 230-openwrt_lzma_options.patch bcm27xx 950-0283-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch x86 011-tune_lzma_options.patch Remove upstreamed patches in collaboration with Ansuel Smith: ipq806x 093-1-v5.8-ipq806x-PCI-qcom-Add-missing-ipq806x-clocks-in-PCIe-driver.patch 093-2-v5.8-ipq806x-PCI-qcom-Change-duplicate-PCI-reset-to-phy-reset.patch 093-3-v5.8-ipq806x-PCI-qcom-Add-missing-reset-for-ipq806x.patch All other modifications made by update_kernel.sh Build-tested: bcm27xx/bcm2708, ipq806x, x86/64 Run-tested: ipq806x (R7800), x86/64 No dmesg regressions, everything functional Signed-off-by: John Audia <graysky@archlinux.us> [update commit message/tested] Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/ramips')
-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 66f1b12618..d7c0df6046 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
-@@ -2856,6 +2856,7 @@ static const struct net_device_ops mtk_n
+@@ -2860,6 +2860,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;
-@@ -2948,6 +2949,9 @@ static int mtk_add_mac(struct mtk_eth *e
+@@ -2952,6 +2953,9 @@ static int mtk_add_mac(struct mtk_eth *e
eth->netdev[id]->max_mtu = MTK_MAX_RX_LENGTH - MTK_RX_ETH_HLEN;