diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2024-05-30 14:23:08 +0100 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2024-05-31 13:26:54 +0100 |
| commit | 2a25c6ace8d833cf491a66846a0b9e7c5387b8f0 (patch) | |
| tree | 03885d8b83e13ea657059fae45c033e7a76dbb31 /target | |
| parent | 983222605ce6fabb036fbbd5797b6689ed082136 (diff) | |
| download | openwrt-2a25c6ace8d833cf491a66846a0b9e7c5387b8f0.tar.gz openwrt-2a25c6ace8d833cf491a66846a0b9e7c5387b8f0.tar.bz2 openwrt-2a25c6ace8d833cf491a66846a0b9e7c5387b8f0.zip | |
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>
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/ramips/mt7621/base-files/lib/preinit/04_set_netdev_label | 15 | ||||
| -rw-r--r-- | target/linux/ramips/patches-6.6/700-net-ethernet-mediatek-support-net-labels.patch | 34 |
2 files changed, 15 insertions, 34 deletions
diff --git a/target/linux/ramips/mt7621/base-files/lib/preinit/04_set_netdev_label b/target/linux/ramips/mt7621/base-files/lib/preinit/04_set_netdev_label new file mode 100644 index 0000000000..110e023b96 --- /dev/null +++ b/target/linux/ramips/mt7621/base-files/lib/preinit/04_set_netdev_label @@ -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 diff --git a/target/linux/ramips/patches-6.6/700-net-ethernet-mediatek-support-net-labels.patch b/target/linux/ramips/patches-6.6/700-net-ethernet-mediatek-support-net-labels.patch deleted file mode 100644 index 0a7f7785db..0000000000 --- a/target/linux/ramips/patches-6.6/700-net-ethernet-mediatek-support-net-labels.patch +++ /dev/null @@ -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: |