From f2d9bdaba79c5fb6f888c6fa68e20471b97fc46f Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 28 Sep 2013 23:32:34 +0200
Subject: [PATCH] Fix MAC address getters for current OpenWRT

---
 .../files/lib/gluon/upgrade/core/initial/011-gluon-network    | 4 ++--
 .../generate/lib/gluon/upgrade/core/initial/010-gluon-system  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/gluon-core/files/lib/gluon/upgrade/core/initial/011-gluon-network b/package/gluon-core/files/lib/gluon/upgrade/core/initial/011-gluon-network
index 0614c811..d03a7ffa 100755
--- a/package/gluon-core/files/lib/gluon/upgrade/core/initial/011-gluon-network
+++ b/package/gluon-core/files/lib/gluon/upgrade/core/initial/011-gluon-network
@@ -34,10 +34,10 @@ EOF
 get_main_address() {
     case "$board" in
 	tl-wdr3600|tl-wdr4300)
-	    uci get wireless.radio1.macaddr
+	    cat /sys/class/ieee80211/phy1/macaddress
 	    ;;
 	*)
-	    uci get wireless.radio0.macaddr
+	    cat /sys/class/ieee80211/phy0/macaddress
 	    ;;
     esac
 }
diff --git a/package/gluon-core/generate/lib/gluon/upgrade/core/initial/010-gluon-system b/package/gluon-core/generate/lib/gluon/upgrade/core/initial/010-gluon-system
index d2803ff9..8b38d33e 100755
--- a/package/gluon-core/generate/lib/gluon/upgrade/core/initial/010-gluon-system
+++ b/package/gluon-core/generate/lib/gluon/upgrade/core/initial/010-gluon-system
@@ -7,7 +7,7 @@ board="$(ar71xx_board_name)"
 case "$board" in
 tl-wdr3600|\
 tl-wdr4300)
-	macaddr="$(uci get wireless.radio1.macaddr)"
+	macaddr="$(cat /sys/class/ieee80211/phy1/macaddress)"
 
 	uci -q batch <<EOF
 		set system.led_wlan2g.trigger='netdev'
@@ -23,7 +23,7 @@ tl-wdr4300)
 EOF
 	;;
 *)
-	macaddr="$(uci get wireless.radio0.macaddr)"
+	macaddr="$(cat /sys/class/ieee80211/phy0/macaddress)"
 
 	uci -q batch <<EOF
 		set system.led_wlan.trigger='netdev'