From: Jouni Malinen <j@w1.fi>
Date: Sun, 20 Dec 2015 17:58:05 +0000 (+0200)
Subject: GAS: Do not cancel initial offchannel wait with comeback delay 1
X-Git-Tag: hostap_2_6~1130
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c24f8e8e75b46f0b191cca788b6f4c10bed81861;p=thirdparty%2Fhostap.git

GAS: Do not cancel initial offchannel wait with comeback delay 1

The minimum comeback delay 1 is used to indicate that fragmentation is
needed instead of indicating that the response is going to be available
only after some time. Do not cancel offchannel wait for this case
between the initial and comeback exchanges to avoid delaying the full
operation unnecessarily.

Signed-off-by: Jouni Malinen <j@w1.fi>
---

diff --git a/wpa_supplicant/gas_query.c b/wpa_supplicant/gas_query.c
index f6435bf7f..457f5fb64 100644
--- a/wpa_supplicant/gas_query.c
+++ b/wpa_supplicant/gas_query.c
@@ -366,7 +366,7 @@ static void gas_query_tx_comeback_req_delay(struct gas_query *gas,
 {
 	unsigned int secs, usecs;
 
-	if (query->offchannel_tx_started) {
+	if (comeback_delay > 1 && query->offchannel_tx_started) {
 		offchannel_send_action_done(gas->wpa_s);
 		query->offchannel_tx_started = 0;
 	}