From: Jouni Malinen <jouni@qca.qualcomm.com>
Date: Thu, 23 May 2013 12:57:13 +0000 (+0300)
Subject: WNM: Fix ess_disassoc timeout to be specified in TBTTs
X-Git-Tag: aosp-kk-from-upstream~223
X-Git-Url: http://www.project-moonshot.org/gitweb/?a=commitdiff_plain;h=8e1bc70231aef41e0bb8851884520122a5fc3f05;p=mech_eap.git

WNM: Fix ess_disassoc timeout to be specified in TBTTs

This was previously claimed to be in ms, but the field in BSS Transition
Management Request frame is in number of TBTTs (beacon interval). Use
that unit in the ESS_DISASSOC control interface command to be able to
specify any value and just modify the timeout value to be calculated
based on beacon interval.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
---

diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
index b0ca6cc..dc9ede7 100644
--- a/hostapd/ctrl_iface.c
+++ b/hostapd/ctrl_iface.c
@@ -595,6 +595,7 @@ static int hostapd_ctrl_iface_ess_disassoc(struct hostapd_data *hapd,
 	/* send disassociation frame after time-out */
 	if (disassoc_timer) {
 		struct sta_info *sta;
+		int timeout, beacon_int;
 
 		/*
 		 * Prevent STA from reconnecting using cached PMKSA to force
@@ -611,10 +612,18 @@ static int hostapd_ctrl_iface_ess_disassoc(struct hostapd_data *hapd,
 			return -1;
 		}
 
+		beacon_int = hapd->iconf->beacon_int;
+		if (beacon_int < 1)
+			beacon_int = 100; /* best guess */
+		/* Calculate timeout in ms based on beacon_int in TU */
+		timeout = disassoc_timer * beacon_int * 128 / 125;
+		wpa_printf(MSG_DEBUG, "Disassociation timer for " MACSTR
+			   " set to %d ms", MAC2STR(addr), timeout);
+
 		sta->timeout_next = STA_DISASSOC_FROM_CLI;
 		eloop_cancel_timeout(ap_handle_timer, hapd, sta);
-		eloop_register_timeout(disassoc_timer / 1000,
-				       disassoc_timer % 1000 * 1000,
+		eloop_register_timeout(timeout / 1000,
+				       timeout % 1000 * 1000,
 				       ap_handle_timer, hapd, sta);
 	}