2020-07-02 23:30:56 +08:00
|
|
|
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
|
2020-10-21 10:51:23 +08:00
|
|
|
@@ -2919,6 +2919,7 @@ static const struct net_device_ops mtk_n
|
2020-07-02 23:30:56 +08:00
|
|
|
|
|
|
|
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;
|
2020-10-21 10:51:23 +08:00
|
|
|
@@ -3011,6 +3012,9 @@ static int mtk_add_mac(struct mtk_eth *e
|
kernel: bump to 4.14.193, 4.19.138, 5.4.59 (#5350)
kernel: bump to 4.14.193, 4.19.138, 5.4.59 (#5350)
431fb8c mac80211: add AQL improvements
6bdd4c9 mac80211: add missing backports for building with 4.14 kernels
0106820 mac80211: add missing return code checks in AQL improvements
e7f7101 mac80211: rework encapsulation offload support
[package]
base-files: add function for generating random MAC
dnsmasq: abort dhcp_check on interface state
boot: sync upstream source code
ath10k-ct-firmware/mt76/sch_cake: update to latest git HEAD
[script]
download: add China Mirror Station
[target]
Sync: arc770, ath79, bcm63xx, kirkwood, lantiq, layerscape,
mediatek, mvebu, octeon, oxnas, pistachio, uml
Sync most of the target patches.
Run-compiled-on: ipq40xx (4.19 & 5.4), ramips
2020-08-26 11:31:50 +08:00
|
|
|
|
|
|
|
eth->netdev[id]->max_mtu = MTK_MAX_RX_LENGTH - MTK_RX_ETH_HLEN;
|
2020-07-02 23:30:56 +08:00
|
|
|
|
|
|
|
+ if (name)
|
|
|
|
+ strlcpy(eth->netdev[id]->name, name, IFNAMSIZ);
|
|
|
|
+
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
free_netdev:
|