summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTianling Shen2025-03-02 12:06:49 +0000
committerHauke Mehrtens2025-03-08 19:12:11 +0000
commit2091c29578ca99b468e79695149be6f4b6cccb36 (patch)
treebd21df97faa7aacd552a49efbc3d68b0afa86af0
parenta0449f8cf3a53f746c409ce033a6c78065c5edde (diff)
downloadopenwrt-2091c29578ca99b468e79695149be6f4b6cccb36.tar.gz
ramips: fix reading mac address for hiwifi hc5962
The spaces in variables have been stripped since commit 551e04f3c9c0 ("base-files: strip space and tab characters from ASCII mac address"), resulting "Vfac_mac " matches nothing. Fix the issue by removing the space at end. Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org> Link: https://github.com/openwrt/openwrt/pull/18150 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-rw-r--r--target/linux/ramips/mt7621/base-files/etc/board.d/02_network2
-rw-r--r--target/linux/ramips/mt7621/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
index 650fef62a8..682b75ab5c 100644
--- a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
@@ -264,7 +264,7 @@ ramips_setup_macs()
wan_mac=$label_mac
;;
hiwifi,hc5962)
- lan_mac=$(mtd_get_mac_ascii bdinfo "Vfac_mac ")
+ lan_mac=$(mtd_get_mac_ascii bdinfo "Vfac_mac")
label_mac=$lan_mac
[ -n "$lan_mac" ] || lan_mac=$(cat /sys/class/net/eth0/address)
wan_mac=$(macaddr_add "$lan_mac" 1)
diff --git a/target/linux/ramips/mt7621/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac b/target/linux/ramips/mt7621/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
index 16c5dfc09b..4f19e2a4eb 100644
--- a/target/linux/ramips/mt7621/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
+++ b/target/linux/ramips/mt7621/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
@@ -103,7 +103,7 @@ case "$board" in
macaddr_setbit_la "$(mtd_get_mac_binary factory 0x4)" > /sys${DEVPATH}/macaddress
;;
hiwifi,hc5962)
- label_mac=$(mtd_get_mac_ascii bdinfo "Vfac_mac ")
+ label_mac=$(mtd_get_mac_ascii bdinfo "Vfac_mac")
[ "$PHYNBR" = "0" ] && [ -n "$label_mac" ] && \
echo -n "$label_mac" > /sys${DEVPATH}/macaddress
[ "$PHYNBR" = "1" ] && [ -n "$label_mac" ] && \