ramips: get rid of downstream network device label patch
Use a simple Shell script like on filogic target to get rid of downstream patch for the Ethernet driver which was rejected upstream long ago. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
parent
983222605c
commit
2a25c6ace8
2 changed files with 15 additions and 34 deletions
|
@ -0,0 +1,15 @@
|
||||||
|
set_netdev_labels() {
|
||||||
|
local dir
|
||||||
|
local label
|
||||||
|
local netdev
|
||||||
|
|
||||||
|
for dir in /sys/class/net/*; do
|
||||||
|
[ -r "$dir/of_node/label" ] || continue
|
||||||
|
read -r label < "$dir/of_node/label"
|
||||||
|
netdev="${dir##*/}"
|
||||||
|
[ "$netdev" = "$label" ] && continue
|
||||||
|
ip link set "$netdev" name "$label"
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
boot_hook_add preinit_main set_netdev_labels
|
|
@ -1,34 +0,0 @@
|
||||||
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
|
|
||||||
@@ -4662,6 +4662,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 device_node *pcs_np;
|
|
||||||
phy_interface_t phy_mode;
|
|
||||||
@@ -4875,6 +4876,9 @@ static int mtk_add_mac(struct mtk_eth *e
|
|
||||||
NETDEV_XDP_ACT_NDO_XMIT |
|
|
||||||
NETDEV_XDP_ACT_NDO_XMIT_SG;
|
|
||||||
|
|
||||||
+ if (name)
|
|
||||||
+ strlcpy(eth->netdev[id]->name, name, IFNAMSIZ);
|
|
||||||
+
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
free_netdev:
|
|
Loading…
Reference in a new issue