From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 21 Jan 2016 13:28:04 +0000 (+0000)
Subject: mac80211: make the path phy lookup more robust regarding config upgrades, allow parti... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=95965cd81349bbbfe99414a74181c07d9c42f4aa;p=openwrt%2Fstaging%2Frmilecki.git

mac80211: make the path phy lookup more robust regarding config upgrades, allow partial path matching

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 48425
---

diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
index 29dd4de4005..02c195e1fa2 100644
--- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
+++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
@@ -394,11 +394,10 @@ mac80211_generate_mac() {
 find_phy() {
 	[ -n "$phy" -a -d /sys/class/ieee80211/$phy ] && return 0
 	[ -n "$path" ] && {
-		for phy in /sys/devices/$path/ieee80211/phy*; do
-			[ -e "$phy" ] && {
-				phy="${phy##*/}"
-				return 0
-			}
+		for phy in $(ls /sys/class/ieee80211 2>/dev/null); do
+			case "$(readlink -f /sys/class/ieee80211/$phy/device)" in
+				*$path) return 0;;
+			esac
 		done
 	}
 	[ -n "$macaddr" ] && {
diff --git a/package/kernel/mac80211/files/lib/wifi/mac80211.sh b/package/kernel/mac80211/files/lib/wifi/mac80211.sh
index ea229d6c033..3fc39c26f27 100644
--- a/package/kernel/mac80211/files/lib/wifi/mac80211.sh
+++ b/package/kernel/mac80211/files/lib/wifi/mac80211.sh
@@ -10,10 +10,9 @@ lookup_phy() {
 	config_get devpath "$device" path
 	[ -n "$devpath" ] && {
 		for _phy in /sys/devices/$devpath/ieee80211/phy*; do
-			[ -e "$_phy" ] && {
-				phy="${_phy##*/}"
-				return
-			}
+			case "$(readlink -f /sys/class/ieee80211/$_phy/device)" in
+				*$devpath) return 0;;
+			esac
 		done
 	}