From 87107dd933953ac4d3a4f4c9821a325af2830b95 Mon Sep 17 00:00:00 2001 From: Bala Venkatesh Date: Tue, 13 Nov 2018 13:10:56 +0530 Subject: [PATCH] qcacmn: Avoid redefination of tdls_add_oper enum Enums tdls_add_oper and TdlsAddOper are same. Instead redefining use the same enum across different files. Change-Id: Ibb71b0f80e156e4bd3a345a56c7b4d99ce770ef7 CRs-Fixed: 2349643 --- core/src/wlan_tdls_cmds_process.h | 13 ------------- dispatcher/inc/wlan_tdls_public_structs.h | 13 +++++++++++++ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/core/src/wlan_tdls_cmds_process.h b/core/src/wlan_tdls_cmds_process.h index bebf1b099f..e66b41aa69 100644 --- a/core/src/wlan_tdls_cmds_process.h +++ b/core/src/wlan_tdls_cmds_process.h @@ -29,19 +29,6 @@ ((TDLS_SETUP_REQUEST <= action) && \ (TDLS_SETUP_CONFIRM >= action)) - -/** - * enum tdls_add_oper - add peer type - * @TDLS_OPER_NONE: none - * @TDLS_OPER_ADD: add new peer - * @TDLS_OPER_UPDATE: used to update peer - */ -enum tdls_add_oper { - TDLS_OPER_NONE, - TDLS_OPER_ADD, - TDLS_OPER_UPDATE -}; - /** * enum legacy_result_code - defined to comply with tSirResultCodes, need refine * when mlme converged. diff --git a/dispatcher/inc/wlan_tdls_public_structs.h b/dispatcher/inc/wlan_tdls_public_structs.h index dd8f1b9237..07bc155d95 100644 --- a/dispatcher/inc/wlan_tdls_public_structs.h +++ b/dispatcher/inc/wlan_tdls_public_structs.h @@ -80,6 +80,19 @@ #define INVALID_TDLS_PEER_ID 0xFF #define TDLS_STA_INDEX_CHECK(sta_id) \ (((sta_id) >= 0) && ((sta_id) < 0xFF)) + +/** + * enum tdls_add_oper - add peer type + * @TDLS_OPER_NONE: none + * @TDLS_OPER_ADD: add new peer + * @TDLS_OPER_UPDATE: used to update peer + */ +enum tdls_add_oper { + TDLS_OPER_NONE, + TDLS_OPER_ADD, + TDLS_OPER_UPDATE +}; + /** * enum tdls_conc_cap - tdls concurrency support * @TDLS_SUPPORTED_ONLY_ON_STA: only support sta tdls