X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fhostapd%2Ffiles%2Fhostapd.sh;h=a2f2d6fd1d4d46d200b4f3837b1be821fb646389;hb=7eba7887af414b5e670449ee52296b2150ba29f9;hp=1159c3b15646d8fadb354d473f13c1487ad9e51b;hpb=dc7f25c42c6aaf6fbd29f7b2971244d3ed4baa26;p=openwrt-10.03%2F.git

diff --git a/package/hostapd/files/hostapd.sh b/package/hostapd/files/hostapd.sh
index 1159c3b15..a2f2d6fd1 100644
--- a/package/hostapd/files/hostapd.sh
+++ b/package/hostapd/files/hostapd.sh
@@ -67,6 +67,7 @@ hostapd_setup_vif() {
 		;;
 		*)
 			wpa=0
+			crypto=
 		;;
 	esac
 	config_get ifname "$vif" ifname
@@ -74,28 +75,29 @@ hostapd_setup_vif() {
 	config_get ssid "$vif" ssid
 	config_get device "$vif" device
 	config_get channel "$device" channel
-	config_get agmode "$device" agmode
-	case "$agmode" in
-		11a) agmode=a;;
-		11b) agmode=b;;
-		11g) agmode=g;;
+	config_get hwmode "$device" hwmode
+	case "$hwmode" in
+		11a) hwmode=a;;
+		11b) hwmode=b;;
+		11g) hwmode=g;;
 		*)
-			agmode=
-			[ "$channel" -gt 14 ] && agmode=a
+			hwmode=
+			[ "$channel" -gt 14 ] && hwmode=a
 		;;
 	esac
 	cat > /var/run/hostapd-$ifname.conf <<EOF
+ctrl_interface=/var/run/hostapd-$ifname
 driver=$driver
 interface=$ifname
-hw_mode=${agmode:-g}
+hw_mode=${hwmode:-g}
 channel=$channel
 ${bridge:+bridge=$bridge}
 ssid=$ssid
 debug=0
 wpa=$wpa
-wpa_pairwise=$crypto
+${crypto:+wpa_pairwise=$crypto}
 $hostapd_cfg
 EOF
-	hostapd -B /var/run/hostapd-$ifname.conf
+	hostapd -P /var/run/wifi-$ifname.pid -B /var/run/hostapd-$ifname.conf
 }