diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-10-09 09:04:24 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-10-09 09:04:24 +0000 |
| commit | d77d06abada4eed4ba00814812be682f0df25bf5 (patch) | |
| tree | 9d7025ce1a7ae3136a294d5d49b76a0da771767b /package | |
| parent | 46e31e96bdef61d86e8b38d806d66428c0251b58 (diff) | |
| download | upstream-d77d06abada4eed4ba00814812be682f0df25bf5.tar.gz upstream-d77d06abada4eed4ba00814812be682f0df25bf5.tar.bz2 upstream-d77d06abada4eed4ba00814812be682f0df25bf5.zip | |
mac80211: remove error from detect script
Signed-off-by: Michel Stam <m.stam@fugro.nl>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42861 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
| -rw-r--r-- | package/kernel/mac80211/files/lib/wifi/mac80211.sh | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/package/kernel/mac80211/files/lib/wifi/mac80211.sh b/package/kernel/mac80211/files/lib/wifi/mac80211.sh index a3b2199507..0b662eb4b1 100644 --- a/package/kernel/mac80211/files/lib/wifi/mac80211.sh +++ b/package/kernel/mac80211/files/lib/wifi/mac80211.sh @@ -19,9 +19,11 @@ lookup_phy() { local macaddr="$(config_get "$device" macaddr | tr 'A-Z' 'a-z')" [ -n "$macaddr" ] && { - for _phy in $(ls /sys/class/ieee80211 2>/dev/null); do - [ "$macaddr" = "$(cat /sys/class/ieee80211/${_phy}/macaddress)" ] || continue - phy="$_phy" + for _phy in /sys/class/ieee80211/*; do + [ -e "$_phy" ] || continue + + [ "$macaddr" = "$(cat ${_phy}/macaddress)" ] || continue + phy="${_phy##*/}" return done } @@ -65,7 +67,12 @@ detect_mac80211() { [ -n "$type" ] || break devidx=$(($devidx + 1)) done - for dev in $(ls /sys/class/ieee80211); do + + for _dev in /sys/class/ieee80211/*; do + [ -e "$_dev" ] || continue + + dev="${_dev##*/}" + found=0 config_foreach check_mac80211_device wifi-device [ "$found" -gt 0 ] && continue |