diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2009-11-28 18:00:59 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2009-11-28 18:00:59 +0000 |
| commit | 756b6fdbf312b441202cfef5883304a0579db8a9 (patch) | |
| tree | d2a51f679efe1e7a9df91958f7eae650b047325f | |
| parent | ff7c793af5a18b56313c8bc0e10f05d3ab7f515a (diff) | |
| download | upstream-756b6fdbf312b441202cfef5883304a0579db8a9.tar.gz upstream-756b6fdbf312b441202cfef5883304a0579db8a9.tar.bz2 upstream-756b6fdbf312b441202cfef5883304a0579db8a9.zip | |
mac80211: fix detection of multiple mac80211 devices
SVN-Revision: 18583
| -rw-r--r-- | package/mac80211/Makefile | 2 | ||||
| -rw-r--r-- | package/mac80211/files/lib/wifi/mac80211.sh | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile index 303618bbd9..5eaf77bdab 100644 --- a/package/mac80211/Makefile +++ b/package/mac80211/Makefile @@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=mac80211 PKG_VERSION:=2009-11-21 -PKG_RELEASE:=5 +PKG_RELEASE:=6 PKG_SOURCE_URL:= \ http://www.orbit-lab.org/kernel/compat-wireless-2.6/2009/11 \ http://wireless.kernel.org/download/compat-wireless-2.6 diff --git a/package/mac80211/files/lib/wifi/mac80211.sh b/package/mac80211/files/lib/wifi/mac80211.sh index 534a737a4d..91fdcf57c2 100644 --- a/package/mac80211/files/lib/wifi/mac80211.sh +++ b/package/mac80211/files/lib/wifi/mac80211.sh @@ -288,16 +288,16 @@ check_device() { detect_mac80211() { devidx=0 config_load wireless + while :; do + config_get type "wifi$devidx" type + [ -n "$type" ] || break + devidx=$(($devidx + 1)) + done for dev in $(ls /sys/class/ieee80211); do found=0 config_foreach check_device wifi-device [ "$found" -gt 0 ] && continue - while :; do - config_get type "wifi$devidx" type - [ -n "$type" ] || break - devidx=$(($devidx + 1)) - done mode_11n="" mode_band="g" channel="5" @@ -335,6 +335,7 @@ config wifi-iface option encryption none EOF + devidx=$(($devidx + 1)) done } |