X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/afb87b33ca6a84890e9080260df97b14c9104667..cb0c6cbf781cfb80c9f7038fa03013693ac23732:/package/hostapd/files/hostapd.sh

diff --git a/package/hostapd/files/hostapd.sh b/package/hostapd/files/hostapd.sh
index 1c2fa35e7..876930d03 100644
--- a/package/hostapd/files/hostapd.sh
+++ b/package/hostapd/files/hostapd.sh
@@ -22,7 +22,7 @@ hostapd_setup_vif() {
 			wpa=3
 			crypto="CCMP TKIP"
 		;;
-		*) 
+		*)
 			wpa=1
 			crypto="TKIP"
 		;;
@@ -46,8 +46,8 @@ hostapd_setup_vif() {
 			fi
 		;;
 		*wpa*|*WPA*)
-		        # required fields? formats?
-		        # hostapd is particular, maybe a default configuration for failures
+			# required fields? formats?
+			# hostapd is particular, maybe a default configuration for failures
 			config_get server "$vif" server
 			append hostapd_cfg "auth_server_addr=$server" "$N"
 			config_get port "$vif" port
@@ -67,6 +67,7 @@ hostapd_setup_vif() {
 		;;
 		*)
 			wpa=0
+			crypto=
 		;;
 	esac
 	config_get ifname "$vif" ifname
@@ -75,25 +76,36 @@ hostapd_setup_vif() {
 	config_get device "$vif" device
 	config_get channel "$device" channel
 	config_get hwmode "$device" hwmode
+	config_get wpa_group_rekey "$vif" wpa_group_rekey
+	config_get ieee80211d "$vif" ieee80211d 
 	case "$hwmode" in
-		11a) hwmode=a;;
-		11b) hwmode=b;;
-		11g) hwmode=g;;
-		*)
-			hwmode=
-			[ "$channel" -gt 14 ] && hwmode=a
-		;;
+		bg) hwmode=g;;
 	esac
+	config_get country "$device" country
+	[ "$channel" = auto ] && channel=
+	[ -n "$channel" -a -z "$hwmode" ] && wifi_fixup_hwmode "$device"
+	[ -n "$hwmode" ] && {
+		config_get hwmode_11n "$device" hwmode_11n
+		[ -n "$hwmode_11n" ] && {
+			hwmode="$hwmode_11n"
+			config_get ht_capab "$device" ht_capab
+		}
+	}
 	cat > /var/run/hostapd-$ifname.conf <<EOF
+ctrl_interface=/var/run/hostapd-$ifname
 driver=$driver
 interface=$ifname
-hw_mode=${hwmode:-g}
-channel=$channel
+${hwmode:+hw_mode=$hwmode}
+${channel:+channel=$channel}
 ${bridge:+bridge=$bridge}
 ssid=$ssid
-debug=0
 wpa=$wpa
-wpa_pairwise=$crypto
+${crypto:+wpa_pairwise=$crypto}
+${country:+country_code=$country}
+${hwmode_11n:+ieee80211n=1}
+${ht_capab:+ht_capab=$ht_capab}
+${wpa_group_rekey:+wpa_group_rekey=$wpa_group_rekey}
+${ieee80211d:+ieee80211d=$ieee80211d}
 $hostapd_cfg
 EOF
 	hostapd -P /var/run/wifi-$ifname.pid -B /var/run/hostapd-$ifname.conf