From 5154273ac35c32e8cafecf16e2acd078685ba2ca Mon Sep 17 00:00:00 2001
From: Naveen Rawat <naveenrawat@codeaurora.org>
Date: Tue, 21 Mar 2017 15:09:34 -0700
Subject: [PATCH] qcacmn: Include NAN component ID in common files

Include NAN component ID in umac common files. These IDs
will be used by NAN component for trace, object ref counting
purpose etc.

Change-Id: Ia831b38627cc02ee8f61e19f389abba0158a1d40
CRs-Fixed: 2014795
---
 qdf/inc/qdf_types.h                             | 2 ++
 qdf/linux/src/qdf_trace.c                       | 1 +
 umac/cmn_services/inc/wlan_cmn.h                | 2 ++
 umac/cmn_services/obj_mgr/inc/wlan_objmgr_cmn.h | 3 +++
 4 files changed, 8 insertions(+)

diff --git a/qdf/inc/qdf_types.h b/qdf/inc/qdf_types.h
index 41289688ea31..d46b3d84710d 100644
--- a/qdf/inc/qdf_types.h
+++ b/qdf/inc/qdf_types.h
@@ -290,6 +290,7 @@ typedef void (*qdf_timer_func_t)(void *);
  * @QDF_MODULE_ID_POLICY_MGR: Policy Manager module ID
  * @QDF_MODULE_ID_CONFIG: CONFIG module ID
  * @QDF_MODULE_ID_REGULATORY    : REGULATORY module ID
+ * @QDF_MODULE_ID_NAN: NAN module ID
  * @QDF_MODULE_ID_ANY: anything
  * @QDF_MODULE_ID_MAX: Max place holder module ID
  */
@@ -375,6 +376,7 @@ typedef enum {
 	QDF_MODULE_ID_POLICY_MGR,
 	QDF_MODULE_ID_CONFIG,
 	QDF_MODULE_ID_REGULATORY,
+	QDF_MODULE_ID_NAN,
 	QDF_MODULE_ID_ANY,
 	QDF_MODULE_ID_MAX,
 } QDF_MODULE_ID;
diff --git a/qdf/linux/src/qdf_trace.c b/qdf/linux/src/qdf_trace.c
index cad94d682d30..52f09eeaae87 100644
--- a/qdf/linux/src/qdf_trace.c
+++ b/qdf/linux/src/qdf_trace.c
@@ -1788,6 +1788,7 @@ struct category_name_info g_qdf_category_name[MAX_SUPPORTED_CATEGORY] = {
 	[QDF_MODULE_ID_MGMT_TXRX] = {"MGMT_TXRX"},
 	[QDF_MODULE_ID_PMO] = {"PMO"},
 	[QDF_MODULE_ID_POLICY_MGR] = {"POLICY_MGR"},
+	[QDF_MODULE_ID_NAN] = {"NAN"},
 	[QDF_MODULE_ID_ANY] = {"ANY"},
 };
 
diff --git a/umac/cmn_services/inc/wlan_cmn.h b/umac/cmn_services/inc/wlan_cmn.h
index 024f9f2ac07a..91449b87fbd2 100644
--- a/umac/cmn_services/inc/wlan_cmn.h
+++ b/umac/cmn_services/inc/wlan_cmn.h
@@ -108,6 +108,7 @@
  * @WLAN_UMAC_COMP_TDLS:     TDLS
  * @WLAN_UMAC_COMP_ATF:      Airtime Fairness
  * @WLAN_UMAC_COMP_CRYPTO:      CRYPTO
+ * @WLAN_UMAC_COMP_NAN: Neighbor Aware Networking
  * @WLAN_UMAC_COMP_ID_MAX: Maximum components in UMAC
  *
  * This id is static.
@@ -127,6 +128,7 @@ enum wlan_umac_comp_id {
 	WLAN_UMAC_COMP_ATF            = 10,
 	WLAN_UMAC_COMP_REGULATORY     = 11,
 	WLAN_UMAC_COMP_CRYPTO         = 12,
+	WLAN_UMAC_COMP_NAN            = 13,
 	WLAN_UMAC_COMP_ID_MAX,
 };
 
diff --git a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_cmn.h b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_cmn.h
index af9eacaf8714..bae5487e1657 100644
--- a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_cmn.h
+++ b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_cmn.h
@@ -165,12 +165,14 @@ typedef void (*wlan_objmgr_peer_status_handler)(
  * @WLAN_PMO_ID:                power manager offload (PMO) ID
  * @WLAN_LEGACY_SME_ID:         Legacy SME operations
  * @WLAN_SCAN_ID:               scan operations
+ * @WLAN_WIFI_POS_ID:           wifi positioning
  * @WLAN_DFS_ID:                DFS operations
  * @WLAN_P2P_ID:                P2P operations
  * @WLAN_TDLS_SB_ID:            TDLS Southbound operations
  * @WLAN_TDLS_NB_ID:            TDLS Northbound operations
  * @WLAN_ATF_ID:                Airtime Fairness operations
  * @WLAN_CRYPTO_ID:             Crypto service operation
+ * @WLAN_NAN_ID:                nan operations
  * @WLAN_REF_ID_MAX:            Max id used to generate ref count tracking array
  */
 typedef enum {
@@ -194,6 +196,7 @@ typedef enum {
 	WLAN_TDLS_NB_ID       = 17,
 	WLAN_ATF_ID           = 18,
 	WLAN_CRYPTO_ID        = 19,
+	WLAN_NAN_ID           = 20,
 	WLAN_REF_ID_MAX,
 } wlan_objmgr_ref_dbgid;