mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 00:41:17 +00:00
2c2fcbd2e0
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>
35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
From bd0f89de5476ca25e73fae829ba3e1dafae1d90d Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Ren=C3=A9=20van=20Dorst?= <opensource@vdorst.com>
|
|
Date: Fri, 21 Jun 2019 10:04:05 +0200
|
|
Subject: [PATCH] net: ethernet: mediatek: support net-labels
|
|
|
|
With this patch, device name can be set within dts file in the same way as dsa
|
|
port can.
|
|
Add: label = "wan"; to GMAC node.
|
|
|
|
Signed-off-by: René van Dorst <opensource@vdorst.com>
|
|
---
|
|
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
--- 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
|
|
|
|
static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np)
|
|
{
|
|
+ const char *name = of_get_property(np, "label", NULL);
|
|
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
|
|
|
|
eth->netdev[id]->max_mtu = MTK_MAX_RX_LENGTH - MTK_RX_ETH_HLEN;
|
|
|
|
+ if (name)
|
|
+ strlcpy(eth->netdev[id]->name, name, IFNAMSIZ);
|
|
+
|
|
return 0;
|
|
|
|
free_netdev:
|