diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2016-01-21 13:28:04 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2016-01-21 13:28:04 +0000 |
| commit | 67baa7498c06a22b67334c562548dc36e339b89e (patch) | |
| tree | 2cba1f130d4f789e1b4e164e31077809dd8ffab6 /package/kernel/mac80211/files/lib/netifd | |
| parent | c8bd3fe0c11dfc48fe914353004b41129685fb30 (diff) | |
| download | master-187ad058-67baa7498c06a22b67334c562548dc36e339b89e.tar.gz master-187ad058-67baa7498c06a22b67334c562548dc36e339b89e.tar.bz2 master-187ad058-67baa7498c06a22b67334c562548dc36e339b89e.zip | |
mac80211: make the path phy lookup more robust regarding config upgrades, allow partial path matching
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48425 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/mac80211/files/lib/netifd')
| -rw-r--r-- | package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh index 29dd4de400..02c195e1fa 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" ] && { |