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/ramips/patches-5.4/401-net-ethernet-mediatek-support-net-labels.patch | |
| 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/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 | 8 |
1 files changed, 4 insertions, 4 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 f29156340b..be453a6d7a 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 -@@ -2943,6 +2943,7 @@ static const struct net_device_ops mtk_n +@@ -2940,6 +2940,7 @@ static const struct net_device_ops mtk_n static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np) { @@ -22,9 +22,9 @@ 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; -@@ -3037,6 +3038,9 @@ static int mtk_add_mac(struct mtk_eth *e - - of_platform_device_create(np, NULL, NULL); +@@ -3032,6 +3033,9 @@ static int mtk_add_mac(struct mtk_eth *e + + eth->netdev[id]->max_mtu = MTK_MAX_RX_LENGTH - MTK_RX_ETH_HLEN; + if (name) + strlcpy(eth->netdev[id]->name, name, IFNAMSIZ); |