X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/913ec84fefd7bc88db0bb63a570ca2a944ccc95d..35d8522c6a2841fe05f3bf02c4f3c2dbea81d8c7:/package/hostapd/files/hostapd.sh

diff --git a/package/hostapd/files/hostapd.sh b/package/hostapd/files/hostapd.sh
index 78dcf82f0..9dc18366d 100644
--- a/package/hostapd/files/hostapd.sh
+++ b/package/hostapd/files/hostapd.sh
@@ -111,6 +111,14 @@ hostapd_set_bss_options() {
 	case "$ieee80211w" in
 		[012])
 			append "$var" "ieee80211w=$ieee80211w" "$N"
+			[ "$ieee80211w" -gt "0" ] && {
+				config_get ieee80211w_max_timeout "$vif" ieee80211w_max_timeout
+				config_get ieee80211w_retry_timeout "$vif" ieee80211w_retry_timeout
+				[ -n "$ieee80211w_max_timeout" ] && \
+					append "$var" "assoc_sa_query_max_timeout=$ieee80211w_max_timeout" "$N"
+				[ -n "$ieee80211w_retry_timeout" ] && \
+					append "$var" "assoc_sa_query_retry_timeout=$ieee80211w_retry_timeout" "$N"
+			}
 		;;
 	esac
 }
@@ -126,7 +134,8 @@ hostapd_setup_vif() {
 	config_get channel "$device" channel
 	config_get hwmode "$device" hwmode
 	case "$hwmode" in
-		*bg) hwmode=g;;
+		*bg|*gdt|*gst|*fh) hwmode=g;;
+		*adt|*ast) hwmode=a;;
 	esac
 	[ "$channel" = auto ] && channel=
 	[ -n "$channel" -a -z "$hwmode" ] && wifi_fixup_hwmode "$device"