diff options
author | John Audia <graysky@archlinux.us> | 2021-08-09 10:47:18 -0400 |
---|---|---|
committer | David Bauer <mail@david-bauer.net> | 2021-08-14 20:25:19 +0200 |
commit | 02e2723ef317c65b6ddfc70144b10f9936cfc2af (patch) | |
tree | c2017456408e825752128c8c122f52437d940d7b /target/linux/bcm4908 | |
parent | 1235e2ee3bcfb678043a0b95ff1a6d4867af2561 (diff) | |
download | upstream-02e2723ef317c65b6ddfc70144b10f9936cfc2af.tar.gz upstream-02e2723ef317c65b6ddfc70144b10f9936cfc2af.tar.bz2 upstream-02e2723ef317c65b6ddfc70144b10f9936cfc2af.zip |
kernel: bump 5.4 to 5.4.139
All patches automatically rebased.
Build system: x86_64
Build-tested: ipq806x/R7800
Run-tested: ipq806x/R7800
No dmesg regressions, everything functional
Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/bcm4908')
2 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/bcm4908/patches-5.4/074-v5.13-0001-net-broadcom-bcm4908_enet-read-MAC-from-OF.patch b/target/linux/bcm4908/patches-5.4/074-v5.13-0001-net-broadcom-bcm4908_enet-read-MAC-from-OF.patch index df004c0480..c4f336e671 100644 --- a/target/linux/bcm4908/patches-5.4/074-v5.13-0001-net-broadcom-bcm4908_enet-read-MAC-from-OF.patch +++ b/target/linux/bcm4908/patches-5.4/074-v5.13-0001-net-broadcom-bcm4908_enet-read-MAC-from-OF.patch @@ -25,7 +25,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> #include <linux/platform_device.h> #include <linux/slab.h> #include <linux/string.h> -@@ -647,7 +649,9 @@ static int bcm4908_enet_probe(struct pla +@@ -647,7 +648,9 @@ static int bcm4908_enet_probe(struct pla return err; SET_NETDEV_DEV(netdev, &pdev->dev); diff --git a/target/linux/bcm4908/patches-5.4/074-v5.13-0003-net-broadcom-bcm4908_enet-support-TX-interrupt.patch b/target/linux/bcm4908/patches-5.4/074-v5.13-0003-net-broadcom-bcm4908_enet-support-TX-interrupt.patch index a20be2ae8b..03ac4b07bf 100644 --- a/target/linux/bcm4908/patches-5.4/074-v5.13-0003-net-broadcom-bcm4908_enet-support-TX-interrupt.patch +++ b/target/linux/bcm4908/patches-5.4/074-v5.13-0003-net-broadcom-bcm4908_enet-support-TX-interrupt.patch @@ -269,7 +269,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> static int bcm4908_enet_change_mtu(struct net_device *netdev, int new_mtu) { struct bcm4908_enet *enet = netdev_priv(netdev); -@@ -642,6 +706,8 @@ static int bcm4908_enet_probe(struct pla +@@ -641,6 +705,8 @@ static int bcm4908_enet_probe(struct pla if (netdev->irq < 0) return netdev->irq; @@ -278,7 +278,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> dma_set_coherent_mask(dev, DMA_BIT_MASK(32)); err = bcm4908_enet_dma_alloc(enet); -@@ -658,7 +724,8 @@ static int bcm4908_enet_probe(struct pla +@@ -655,7 +721,8 @@ static int bcm4908_enet_probe(struct pla netdev->min_mtu = ETH_ZLEN; netdev->mtu = ETH_DATA_LEN; netdev->max_mtu = ENET_MTU_MAX; @@ -288,7 +288,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> err = register_netdev(netdev); if (err) { -@@ -676,7 +743,8 @@ static int bcm4908_enet_remove(struct pl +@@ -673,7 +740,8 @@ static int bcm4908_enet_remove(struct pl struct bcm4908_enet *enet = platform_get_drvdata(pdev); unregister_netdev(enet->netdev); |