[openwrt/openwrt] ath79: fix label MAC address for Ubiquiti UniFi

LEDE Commits lede-commits at lists.infradead.org
Thu Mar 24 01:35:38 PDT 2022


neoraider pushed a commit to openwrt/openwrt.git, branch openwrt-22.03:
https://git.openwrt.org/3666958c2a46dae061a0deb8e1f29ed003eaef3e

commit 3666958c2a46dae061a0deb8e1f29ed003eaef3e
Author: Matthias Schiffer <mschiffer at universe-factory.net>
AuthorDate: Wed Mar 23 22:06:50 2022 +0100

    ath79: fix label MAC address for Ubiquiti UniFi
    
    The label has the MAC address of eth0, not the WLAN PHY address.
    
    Signed-off-by: Matthias Schiffer <mschiffer at universe-factory.net>
    (cherry picked from commit 2a02b7049966dc77ae9519ca165f29b75e0dbf0e)
---
 target/linux/ath79/dts/ar7241_ubnt_unifi-ap-outdoor-plus.dts | 1 +
 target/linux/ath79/dts/ar7241_ubnt_unifi.dts                 | 1 +
 target/linux/ath79/dts/ar7241_ubnt_unifi.dtsi                | 4 ----
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/target/linux/ath79/dts/ar7241_ubnt_unifi-ap-outdoor-plus.dts b/target/linux/ath79/dts/ar7241_ubnt_unifi-ap-outdoor-plus.dts
index 9ccbdbd450..b5d7af421d 100644
--- a/target/linux/ath79/dts/ar7241_ubnt_unifi-ap-outdoor-plus.dts
+++ b/target/linux/ath79/dts/ar7241_ubnt_unifi-ap-outdoor-plus.dts
@@ -7,6 +7,7 @@
 	model = "Ubiquiti UniFi AP Outdoor+";
 
 	aliases {
+		label-mac-device = &wifi;
 		led-boot = &led_white;
 		led-failsafe = &led_white;
 		led-running = &led_blue;
diff --git a/target/linux/ath79/dts/ar7241_ubnt_unifi.dts b/target/linux/ath79/dts/ar7241_ubnt_unifi.dts
index e8d903b305..9b312b8fde 100644
--- a/target/linux/ath79/dts/ar7241_ubnt_unifi.dts
+++ b/target/linux/ath79/dts/ar7241_ubnt_unifi.dts
@@ -7,6 +7,7 @@
 	model = "Ubiquiti UniFi";
 
 	aliases {
+		label-mac-device = &eth0;
 		led-boot = &led_dome_green;
 		led-failsafe = &led_dome_green;
 		led-running = &led_dome_green;
diff --git a/target/linux/ath79/dts/ar7241_ubnt_unifi.dtsi b/target/linux/ath79/dts/ar7241_ubnt_unifi.dtsi
index 54f133ab19..ac8c0cc709 100644
--- a/target/linux/ath79/dts/ar7241_ubnt_unifi.dtsi
+++ b/target/linux/ath79/dts/ar7241_ubnt_unifi.dtsi
@@ -6,10 +6,6 @@
 #include <dt-bindings/input/input.h>
 
 / {
-	aliases {
-		label-mac-device = &wifi;
-	};
-
 	extosc: ref {
 		compatible = "fixed-clock";
 		#clock-cells = <0>;




More information about the lede-commits mailing list