DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

GAS: Limit TX wait time based on driver maximum value

Browse source 
The GAS query TX operation used a fixed wait time of 1000 ms for the
reply. However, it would be possible for the driver to not support this
long remain-on-channel maximum. Limit this wait time based on driver
support, if needed.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2014-06-12 10:56:06 +03:00 committed by Jouni Malinen
parent a0ab408d3b
commit 5519241676
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
wpa_supplicant/gas_query.c
View file

@ -256,6 +256,7 @@ static int pmf_in_use(struct wpa_supplicant *wpa_s, const u8 *addr)
static int gas_query_tx(struct gas_query *gas, struct gas_query_pending *query, static int gas_query_tx(struct gas_query *gas, struct gas_query_pending *query,
struct wpabuf *req) struct wpabuf *req)
{ {
unsigned int wait_time;
int res, prot = pmf_in_use(gas->wpa_s, query->addr); int res, prot = pmf_in_use(gas->wpa_s, query->addr);
wpa_printf(MSG_DEBUG, "GAS: Send action frame to " MACSTR " len=%u " wpa_printf(MSG_DEBUG, "GAS: Send action frame to " MACSTR " len=%u "
@ -266,10 +267,14 @@ static int gas_query_tx(struct gas_query *gas, struct gas_query_pending *query,
*categ = WLAN_ACTION_PROTECTED_DUAL; *categ = WLAN_ACTION_PROTECTED_DUAL;
} }
os_get_reltime(&query->last_oper); os_get_reltime(&query->last_oper);
wait_time = 1000;
if (gas->wpa_s->max_remain_on_chan &&
wait_time > gas->wpa_s->max_remain_on_chan)
wait_time = gas->wpa_s->max_remain_on_chan;
res = offchannel_send_action(gas->wpa_s, query->freq, query->addr, res = offchannel_send_action(gas->wpa_s, query->freq, query->addr,
gas->wpa_s->own_addr, query->addr, gas->wpa_s->own_addr, query->addr,
wpabuf_head(req), wpabuf_len(req), 1000, wpabuf_head(req), wpabuf_len(req),
gas_query_tx_status, 0); wait_time, gas_query_tx_status, 0);
if (res == 0) if (res == 0)
query->offchannel_tx_started = 1; query->offchannel_tx_started = 1;
return res; return res;