aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2012-08-13 18:33:00 (GMT)
committerJouni Malinen <j@w1.fi>2012-08-13 18:33:00 (GMT)
commit1f52c2f7b5187eab84f592aac5dff3f97f325da7 (patch)
treeb87b0804cd7f1e708fa504da472003fed336e584 /wpa_supplicant
parent067ffa269611a740c897b9d54d08d6529c9545f6 (diff)
downloadhostap-1f52c2f7b5187eab84f592aac5dff3f97f325da7.zip
hostap-1f52c2f7b5187eab84f592aac5dff3f97f325da7.tar.gz
hostap-1f52c2f7b5187eab84f592aac5dff3f97f325da7.tar.bz2
GAS: Fix reporting of GAS query timeouts
GAS_QUERY_TIMEOUT value was used for two different things - enum for status callback and #define for internal eloop timeout). The latter overwrites the former and as such, the timeout reported ended up going out with value 5 which matches with GAS_QUERY_CANCELLED instead of GAS_QUERY_TIMEOUT. This value was not used in existing code, so this should not modify the current behavior. Anyway, the correct reason for the failure should be reported. Rename the internal #define for the timeout period to avoid the name conflict. [Bug 463] Signed-hostap: Jouni Malinen <j@w1.fi>
Diffstat (limited to 'wpa_supplicant')
-rw-r--r--wpa_supplicant/gas_query.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/wpa_supplicant/gas_query.c b/wpa_supplicant/gas_query.c
index 1fd6e00..efa9be8 100644
--- a/wpa_supplicant/gas_query.c
+++ b/wpa_supplicant/gas_query.c
@@ -19,7 +19,7 @@
#include "gas_query.h"
-#define GAS_QUERY_TIMEOUT 5
+#define GAS_QUERY_TIMEOUT_PERIOD 5
struct gas_query_pending {
@@ -457,7 +457,7 @@ int gas_query_req(struct gas_query *gas, const u8 *dst, int freq,
return -1;
}
- eloop_register_timeout(GAS_QUERY_TIMEOUT, 0, gas_query_timeout,
+ eloop_register_timeout(GAS_QUERY_TIMEOUT_PERIOD, 0, gas_query_timeout,
gas, query);
return dialog_token;