From: Jouni Malinen Date: Sun, 20 Dec 2015 17:37:06 +0000 (+0200) Subject: GAS: Clear offchannel_tx_started when ending remain-on-channel X-Git-Tag: hostap_2_6~1137 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c012567df6249d14b6aa78f40fa7f16f6cb8fb97;p=thirdparty%2Fhostap.git GAS: Clear offchannel_tx_started when ending remain-on-channel Commit 2c0d0ae370f72fbe6248feed7ea0635303e3dc5a ('GAS: End remain-on-channel due to delayed GAS comeback request') started ending the remain-on-channel operation between the initial request and the following comeback request. However, it did not check or update the offchannel_tx_started variable. While this alone would not necessarily be problematic, this makes it more difficult to optimize wait time for offchannel TX operations, so make sure the internal tracking variable gets updated. Signed-off-by: Jouni Malinen --- diff --git a/wpa_supplicant/gas_query.c b/wpa_supplicant/gas_query.c index 65dec2b14..fdb36df10 100644 --- a/wpa_supplicant/gas_query.c +++ b/wpa_supplicant/gas_query.c @@ -319,7 +319,10 @@ static void gas_query_tx_comeback_req_delay(struct gas_query *gas, { unsigned int secs, usecs; - offchannel_send_action_done(gas->wpa_s); + if (query->offchannel_tx_started) { + offchannel_send_action_done(gas->wpa_s); + query->offchannel_tx_started = 0; + } secs = (comeback_delay * 1024) / 1000000; usecs = comeback_delay * 1024 - secs * 1000000;