From: Travis Kemen <thepeople@openwrt.org>
Date: Wed, 24 Mar 2010 00:23:10 +0000 (+0000)
Subject: When enabling MFP, hostapd will read assoc_sa_query_max_timeout and assoc_sa_query_re... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7a00430b3e1fee6036be79fc11899e0c5b9e956d;p=openwrt%2Fstaging%2Fjow.git

When enabling MFP, hostapd will read assoc_sa_query_max_timeout and assoc_sa_query_retry_timeout from it's config file. Make these options configurable in /etc/config/wireless. To make it clear that these options are 802.11w related, I named them ieee80211w_max_timeout and ieee80211w_retry_timeout instead.

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>

SVN-Revision: 20397
---

diff --git a/package/hostapd/files/hostapd.sh b/package/hostapd/files/hostapd.sh
index 78dcf82f0b..9ef8282bd3 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
 }