X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=package%2Fmadwifi%2Ffiles%2Flib%2Fwifi%2Fmadwifi.sh;fp=package%2Fmadwifi%2Ffiles%2Flib%2Fwifi%2Fmadwifi.sh;h=eb687696f742d0966f033f03ca70873bf1eeb1c3;hb=854ac9b253390571fe49553da50d98a045f8beeb;hp=2e37325511ea55cd3069e8f58f8f892ec924a9f9;hpb=8f43d52d524a1c9e1c74723583f62aae9b0ea825;p=12.09%2Fopenwrt.git

diff --git a/package/madwifi/files/lib/wifi/madwifi.sh b/package/madwifi/files/lib/wifi/madwifi.sh
index 2e37325..eb68769 100755
--- a/package/madwifi/files/lib/wifi/madwifi.sh
+++ b/package/madwifi/files/lib/wifi/madwifi.sh
@@ -390,8 +390,8 @@ enable_atheros() {
 		txpower="${txpower:-$vif_txpower}"
 		[ -z "$txpower" ] || iwconfig "$ifname" txpower "${txpower%%.*}"
 
-		case "$mode" in
-			ap)
+		case "$mode:$enc" in
+			ap:*)
 				config_get_bool isolate "$vif" isolate 0
 				iwpriv "$ifname" ap_bridge "$((isolate^1))"
 
@@ -405,7 +405,7 @@ enable_atheros() {
 					}
 				fi
 			;;
-			wds|sta)
+			wds:*|sta:*)
 				if eval "type wpa_supplicant_setup_vif" 2>/dev/null >/dev/null; then
 					wpa_supplicant_setup_vif "$vif" wext || {
 						echo "enable_atheros($device): Failed to set up wpa_supplicant for interface $ifname" >&2
@@ -415,7 +415,7 @@ enable_atheros() {
 					}
 				fi
 			;;
-			adhoc)
+			adhoc:wep*|adhoc:psk*|adhoc:wpa*)
 				if eval "type wpa_supplicant_setup_vif" 2>/dev/null >/dev/null; then
 					wpa_supplicant_setup_vif "$vif" madwifi || {
 						echo "enable_atheros($device): Failed to set up wpa"
@@ -424,6 +424,7 @@ enable_atheros() {
 						continue
 					}
 				fi
+			;;
 		esac
 	done
 }