diff options
| -rw-r--r-- | package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh | 10 | ||||
| -rw-r--r-- | package/kernel/mac80211/files/lib/wifi/mac80211.sh | 10 |
2 files changed, 14 insertions, 6 deletions
diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh index 64b0f989b7..e6241deb5f 100644 --- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh +++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh @@ -364,9 +364,13 @@ mac80211_generate_mac() { find_phy() { [ -n "$phy" -a -d /sys/class/ieee80211/$phy ] && return 0 - [ -n "$path" -a -d "/sys/devices/$path/ieee80211" ] && { - phy="$(ls /sys/devices/$path/ieee80211 | grep -m 1 phy)" - [ -n "$phy" ] && return 0 + [ -n "$path" ] && { + for phy in /sys/devices/$path/ieee80211/phy*; do + [ -e "$phy" ] && { + phy="${phy##*/}" + return 0 + } + done } [ -n "$macaddr" ] && { for phy in $(ls /sys/class/ieee80211 2>/dev/null); do diff --git a/package/kernel/mac80211/files/lib/wifi/mac80211.sh b/package/kernel/mac80211/files/lib/wifi/mac80211.sh index 5d3adb1511..a3b2199507 100644 --- a/package/kernel/mac80211/files/lib/wifi/mac80211.sh +++ b/package/kernel/mac80211/files/lib/wifi/mac80211.sh @@ -8,9 +8,13 @@ lookup_phy() { local devpath config_get devpath "$device" path - [ -n "$devpath" -a -d "/sys/devices/$devpath/ieee80211" ] && { - phy="$(ls /sys/devices/$devpath/ieee80211 | grep -m 1 phy)" - [ -n "$phy" ] && return + [ -n "$devpath" ] && { + for _phy in /sys/devices/$devpath/ieee80211/phy*; do + [ -e "$_phy" ] && { + phy="${_phy##*/}" + return + } + done } local macaddr="$(config_get "$device" macaddr | tr 'A-Z' 'a-z')" |