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

GAS: Remove unused gas_query_cancel()

Browse source 
This function was added with the initial GAS implementation, but there
was no user for it at the time and no clear use now either, so remove
the unused function and the related GAS query reason code.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2016-06-27 16:31:03 +03:00
parent 37a6765967
commit d6e93d3e09
2 changed files with 0 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
wpa_supplicant/gas_query.c
View file

@ -117,8 +117,6 @@ static const char * gas_result_txt(enum gas_query_result result)
return "PEER_ERROR"; return "PEER_ERROR";
case GAS_QUERY_INTERNAL_ERROR: case GAS_QUERY_INTERNAL_ERROR:
return "INTERNAL_ERROR"; return "INTERNAL_ERROR";
case GAS_QUERY_CANCELLED:
return "CANCELLED";
case GAS_QUERY_DELETED_AT_DEINIT: case GAS_QUERY_DELETED_AT_DEINIT:
return "DELETED_AT_DEINIT"; return "DELETED_AT_DEINIT";
} }
@ -782,20 +780,3 @@ int gas_query_req(struct gas_query *gas, const u8 *dst, int freq,
return dialog_token; return dialog_token;
} }
/**
* gas_query_cancel - Cancel a pending GAS query
* @gas: GAS query data from gas_query_init()
* @dst: Destination MAC address for the query
* @dialog_token: Dialog token from gas_query_req()
*/
void gas_query_cancel(struct gas_query *gas, const u8 *dst, u8 dialog_token)
{
struct gas_query_pending *query;
query = gas_query_get_pending(gas, dst, dialog_token);
if (query)
gas_query_done(gas, query, GAS_QUERY_CANCELLED);
}

2
wpa_supplicant/gas_query.h
View file

@ -29,7 +29,6 @@ enum gas_query_result {
GAS_QUERY_TIMEOUT, GAS_QUERY_TIMEOUT,
GAS_QUERY_PEER_ERROR, GAS_QUERY_PEER_ERROR,
GAS_QUERY_INTERNAL_ERROR, GAS_QUERY_INTERNAL_ERROR,
GAS_QUERY_CANCELLED,
GAS_QUERY_DELETED_AT_DEINIT GAS_QUERY_DELETED_AT_DEINIT
}; };
@ -40,7 +39,6 @@ int gas_query_req(struct gas_query *gas, const u8 *dst, int freq,
const struct wpabuf *adv_proto, const struct wpabuf *adv_proto,
const struct wpabuf *resp, u16 status_code), const struct wpabuf *resp, u16 status_code),
void *ctx); void *ctx);
void gas_query_cancel(struct gas_query *gas, const u8 *dst, u8 dialog_token);
#else /* CONFIG_GAS */ #else /* CONFIG_GAS */