X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/2ea8f22fbe87280385f5795c106cc6de89052871..6c93a964d229c973eb3e69147108daca97804f68:/package/madwifi/files/lib/wifi/madwifi.sh

diff --git a/package/madwifi/files/lib/wifi/madwifi.sh b/package/madwifi/files/lib/wifi/madwifi.sh
index de9870ce6..a22b5c4ad 100755
--- a/package/madwifi/files/lib/wifi/madwifi.sh
+++ b/package/madwifi/files/lib/wifi/madwifi.sh
@@ -45,71 +45,6 @@ scan_atheros() {
 	config_set "$device" vifs "${ap:+$ap }${adhoc:+$adhoc }${sta:+$sta }${wds:+$wds }"
 }
 
-hostapd_setup_vif() {
-	local vif="$1"
-	local driver="$2"
-	local hostapd_cfg=
-
-	# Examples:
-	# psk-mixed/tkip 	=> WPA1+2 PSK, TKIP
-	# wpa-psk2/tkip+aes	=> WPA2 PSK, CCMP+TKIP
-	# wpa2/tkip+aes 	=> WPA2 RADIUS, CCMP+TKIP
-	# ...
-
-	# TODO: move this parsing function somewhere generic, so that
-	# later it can be reused by drivers that don't use hostapd
-	
-	# crypto defaults: WPA2 vs WPA1
-	case "$enc" in
-		wpa2*|WPA2*|*PSK2*|*psk2*)
-			wpa=2
-			crypto="CCMP"
-		;;
-		*mixed*)
-			wpa=3
-			crypto="CCMP TKIP"
-		;;
-		*) 
-			wpa=1
-			crypto="TKIP"
-		;;
-	esac
-
-	# explicit override for crypto setting
-	case "$enc" in
-		*tkip+aes|*TKIP+AES|*tkip+ccmp|*TKIP+CCMP) crypto="CCMP TKIP";;
-		*tkip|*TKIP) crypto="TKIP";;
-		*aes|*AES|*ccmp|*CCMP) crypto="CCMP";;
-	esac
-	
-	# use crypto/auth settings for building the hostapd config
-	case "$enc" in
-		*psk*|*PSK*)
-			config_get psk "$vif" key
-			append hostapd_cfg "wpa_passphrase=$psk" "$N"
-		;;
-		*wpa*|*WPA*)
-		# FIXME: add wpa+radius here
-		;;
-		*)
-			return 0;
-		;;
-	esac
-	config_get ifname "$vif" ifname
-	config_get bridge "$vif" bridge
-	config_get ssid "$vif" ssid
-	cat > /var/run/hostapd-$ifname.conf <<EOF
-driver=$driver
-interface=$ifname
-${bridge:+bridge=$bridge}
-ssid=$ssid
-debug=0
-wpa=$wpa
-wpa_pairwise=$crypto
-$hostapd_cfg
-EOF
-	hostapd -B /var/run/hostapd-$ifname.conf
-}
 
 disable_atheros() (
 	local device="$1"
@@ -154,6 +89,9 @@ enable_atheros() {
 		}
 		config_set "$vif" ifname "$ifname"
 
+		config_get "$device" mode
+		iwpriv "$ifname" mode "${mode:-11g}"
+
 		config_get wds "$vif" wds
 		case "$wds" in
 			1|on|enabled) wds=1;;
@@ -192,6 +130,7 @@ enable_atheros() {
 			config_set "$vif" bridge "$bridge"
 			start_net "$ifname" "$net_cfg"
 		}
+		iwconfig "$ifname" essid "$ssid"
 		case "$mode" in
 			ap)
 				hostapd_setup_vif "$vif" madwifi || {
@@ -203,7 +142,6 @@ enable_atheros() {
 				}
 			;;
 			wds|sta)
-				iwconfig "$ifname" essid "$ssid"
 				# FIXME: implement wpa_supplicant calls here
 			;;
 		esac