GAS: Remove unused gas_query_cancel()

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>

diff --git a/wpa_supplicant/gas_query.c b/wpa_supplicant/gas_query.c
index 824d35c047804b323e7ab325cfc5323838de5eea..c0c8c46bc184d6059e47f1c586a5eeab51bce0f1 100644 (file)
--- a/wpa_supplicant/gas_query.c
+++ b/wpa_supplicant/gas_query.c
@@ -117,8 +117,6 @@ static const char * gas_result_txt(enum gas_query_result result)
                return "PEER_ERROR";
        case GAS_QUERY_INTERNAL_ERROR:
                return "INTERNAL_ERROR";
-       case GAS_QUERY_CANCELLED:
-               return "CANCELLED";
        case GAS_QUERY_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;
 }
-
-
-/**
- * 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);
-
-}

diff --git a/wpa_supplicant/gas_query.h b/wpa_supplicant/gas_query.h
index ad1349088ee1f2581e37ff7f3cac4dc7220ae2a7..ef82097e2424b51f2ea3cfed381ea37e4035536c 100644 (file)
--- a/wpa_supplicant/gas_query.h
+++ b/wpa_supplicant/gas_query.h
@@ -29,7 +29,6 @@ enum gas_query_result {
        GAS_QUERY_TIMEOUT,
        GAS_QUERY_PEER_ERROR,
        GAS_QUERY_INTERNAL_ERROR,
-       GAS_QUERY_CANCELLED,
        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 *resp, u16 status_code),
                  void *ctx);
-void gas_query_cancel(struct gas_query *gas, const u8 *dst, u8 dialog_token);
 
 #else /* CONFIG_GAS */