X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/9b43f9743b97e160a43247759bd50fca837a4001..c291b847846f5921d669b17478cbf59f0c83ee19:/package/madwifi/files/lib/wifi/madwifi.sh?ds=sidebyside

diff --git a/package/madwifi/files/lib/wifi/madwifi.sh b/package/madwifi/files/lib/wifi/madwifi.sh
index 9288f4d9e..9d08e1fab 100755
--- a/package/madwifi/files/lib/wifi/madwifi.sh
+++ b/package/madwifi/files/lib/wifi/madwifi.sh
@@ -14,18 +14,17 @@ scan_atheros() {
 		
 		config_get mode "$vif" mode
 		case "$mode" in
-			adhoc|ahdemo|sta|ap)
+			adhoc|ahdemo|sta|ap|monitor)
 				append $mode "$vif"
 			;;
 			wds)
-				config_get addr "$vif" bssid
 				config_get ssid "$vif" ssid
-				[ -z "$addr" -a -n "$ssid" ] && {
-					config_set "$vif" wds 1
-					config_set "$vif" mode sta
-					mode="sta"
-					addr="$ssid"
-				}
+				[ -z "$ssid" ] && continue
+
+				config_set "$vif" wds 1
+				config_set "$vif" mode sta
+				mode="sta"
+				addr="$ssid"
 				${addr:+append $mode "$vif"}
 			;;
 			*) echo "$device($vif): Invalid mode, ignored."; continue;;
@@ -43,7 +42,7 @@ scan_atheros() {
 		*) echo "$device: Invalid mode combination in config"; return 1;;
 	esac
 
-	config_set "$device" vifs "${ap:+$ap }${adhoc:+$adhoc }${ahdemo:+$ahdemo }${sta:+$sta }${wds:+$wds }"
+	config_set "$device" vifs "${ap:+$ap }${adhoc:+$adhoc }${ahdemo:+$ahdemo }${sta:+$sta }${wds:+$wds }${monitor:+$monitor}"
 }
 
 
@@ -97,6 +96,8 @@ enable_atheros() {
 		[ "$first" = 1 ] && {
 			# only need to change freq band and channel on the first vif
 			config_get agmode "$device" agmode
+			[ -z "$agmode" ] && config_get agmode "$device" mode
+
 			pureg=0
 			case "$agmode" in
 				*b) agmode=11b;;
@@ -105,12 +106,9 @@ enable_atheros() {
 				*a) agmode=11a;;
 				*) agmode=auto;;
 			esac
-			iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null 
-			sleep 1
 			iwpriv "$ifname" mode "$agmode"
 			iwpriv "$ifname" pureg "$pureg"
 			iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null 
-			ifconfig "$ifname" up
 		}
 	
 		config_get_bool hidden "$vif" hidden 0
@@ -128,6 +126,11 @@ enable_atheros() {
 		esac
 		iwpriv "$ifname" wds "$wds"
 
+		[ "$mode" = ap -a "$wds" = 1 ] && {
+			config_get_bool wdssep "$vif" wdssep 1
+			[ -n "$wdssep" ] && iwpriv "$ifname" wdssep "$wdssep"
+		}
+
 		wpa=
 		case "$enc" in
 			WEP|wep)
@@ -148,10 +151,6 @@ enable_atheros() {
 		esac
 
 		case "$mode" in
-			wds)
-				config_get addr "$vif" bssid
-				iwpriv "$ifname" wds_add "$addr"
-			;;
 			adhoc|ahdemo)
 				config_get addr "$vif" bssid
 				[ -z "$addr" ] || { 
@@ -191,9 +190,6 @@ enable_atheros() {
 		config_get rts "$vif" rts
 		[ -n "$rts" ] && iwconfig "$ifname" rts "${rts%%.*}"
 
-		config_get_bool doth "$vif" 80211h
-		[ -n "$doth" ] && iwpriv "$ifname" doth "$doth"
-
 		config_get_bool comp "$vif" compression
 		[ -n "$comp" ] && iwpriv "$ifname" compression "$comp"
 
@@ -245,8 +241,6 @@ enable_atheros() {
 		esac
 
 		ifconfig "$ifname" up
-		iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null 
-
 		local net_cfg bridge
 		net_cfg="$(find_net_config "$vif")"
 		[ -z "$net_cfg" ] || {
@@ -307,7 +301,7 @@ EOF
 						#add wpa_supplicant calls here
 					;;
 				esac
-				[ -z "$proto" ] || wpa_supplicant ${bridge:+ -b $bridge} -B -D wext -i "$ifname" -c /var/run/wpa_supplicant-$ifname.conf
+				[ -z "$proto" ] || wpa_supplicant ${bridge:+ -b $bridge} -B -D madwifi -i "$ifname" -c /var/run/wpa_supplicant-$ifname.conf
 			;;
 		esac
 		first=0