From 82377ce4dd183948d24f6d041a45b44533c8c29b Mon Sep 17 00:00:00 2001 From: Zhang Qian Date: Thu, 4 Jan 2018 12:15:29 +0800 Subject: [PATCH] qcacmn: ADD OCB module ID Add module ID and trace log for componentized OCB feature. CRs-Fixed: 2177252 Change-Id: I794ce0809afed19863b52d26d9fcf1bde5e5e754 --- qdf/inc/qdf_types.h | 4 +++- qdf/linux/src/qdf_trace.c | 4 ++-- umac/cmn_services/inc/wlan_cmn.h | 5 ++++- umac/cmn_services/obj_mgr/inc/wlan_objmgr_cmn.h | 7 ++++++- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/qdf/inc/qdf_types.h b/qdf/inc/qdf_types.h index acd3ffb57f2e..9fb3dbb8a7ab 100644 --- a/qdf/inc/qdf_types.h +++ b/qdf/inc/qdf_types.h @@ -317,7 +317,7 @@ typedef void (*qdf_timer_func_t)(void *); * @QDF_MODULE_ID_P2P: P2P module ID * @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_REGULATORY: REGULATORY module ID * @QDF_MODULE_ID_NAN: NAN module ID * @QDF_MODULE_ID_SPECTRAL: Spectral module ID * @QDF_MODULE_ID_ROAM_DEBUG: Roam Debug logging @@ -328,6 +328,7 @@ typedef void (*qdf_timer_func_t)(void *); * @QDF_MODULE_ID_FTM: FTM module ID * @QDF_MODULE_ID_EXTAP: Extender AP module ID * @QDF_MODULE_ID_FD: FILS discovery logging + * @QDF_MODULE_ID_OCB: OCB module ID * @QDF_MODULE_ID_ANY: anything * @QDF_MODULE_ID_MAX: Max place holder module ID */ @@ -428,6 +429,7 @@ typedef enum { QDF_MODULE_ID_FTM, QDF_MODULE_ID_EXTAP, QDF_MODULE_ID_FD, + QDF_MODULE_ID_OCB, 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 82a480bd6557..92fa108c132d 100644 --- a/qdf/linux/src/qdf_trace.c +++ b/qdf/linux/src/qdf_trace.c @@ -2122,7 +2122,7 @@ struct category_name_info g_qdf_category_name[MAX_SUPPORTED_CATEGORY] = { [QDF_MODULE_ID_EXTAP] = {"EXTAP"}, [QDF_MODULE_ID_FD] = {"FILS discovery"}, [QDF_MODULE_ID_FTM] = {"FTM"}, - + [QDF_MODULE_ID_OCB] = {"OCB"}, [QDF_MODULE_ID_ANY] = {"ANY"}, }; EXPORT_SYMBOL(g_qdf_category_name); @@ -2595,7 +2595,7 @@ static void set_default_trace_levels(struct category_info *cinfo) [QDF_MODULE_ID_EXTAP] = QDF_TRACE_LEVEL_NONE, [QDF_MODULE_ID_FD] = QDF_TRACE_LEVEL_ERROR, [QDF_MODULE_ID_FTM] = QDF_TRACE_LEVEL_ERROR, - + [QDF_MODULE_ID_OCB] = QDF_TRACE_LEVEL_ERROR, [QDF_MODULE_ID_ANY] = QDF_TRACE_LEVEL_NONE, }; diff --git a/umac/cmn_services/inc/wlan_cmn.h b/umac/cmn_services/inc/wlan_cmn.h index 4ab2a1d432c2..f9eda3e112b5 100644 --- a/umac/cmn_services/inc/wlan_cmn.h +++ b/umac/cmn_services/inc/wlan_cmn.h @@ -119,12 +119,14 @@ * @WLAN_UMAC_COMP_DFS: DFS * @WLAN_UMAC_COMP_SPECTRAL: Spectral * @WLAN_UMAC_COMP_OFFCHAN_TXRX: Offchan TxRx + * @WLAN_UMAC_COMP_SON: SON + * @WLAN_UMAC_COMP_SPECTRAL: Spectral * @WLAN_UMAC_COMP_SPLITMAC: SplitMAC * @WLAN_UMAC_COMP_DISA: DISA encryption test * @WLAN_UMAC_COMP_GREEN_AP: Green AP * @WLAN_UMAC_COMP_FTM: FTM component * @WLAN_UMAC_COMP_FD: FILS Discovery - * + * @WLAN_UMAC_COMP_OCB: OCB * @WLAN_UMAC_COMP_ID_MAX: Maximum components in UMAC * * This id is static. @@ -156,6 +158,7 @@ enum wlan_umac_comp_id { WLAN_UMAC_COMP_GREEN_AP, WLAN_UMAC_COMP_FTM, WLAN_UMAC_COMP_FD, + WLAN_UMAC_COMP_OCB, 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 c1e987d1198d..992e95ab48aa 100644 --- a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_cmn.h +++ b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_cmn.h @@ -201,6 +201,8 @@ typedef void (*wlan_objmgr_peer_status_handler)( * @WLAN_REGULATORY_SB_ID: SB regulatory operations * @WLAN_REGULATORY_NB_ID: NB regulatory operations * @WLAN_POLICY_MGR_ID: Policy Manager operations + * @WLAN_SON_ID: SON + * @WLAN_SA_API_ID: SA PAI * @WLAN_SPECTRAL_ID: Spectral operations * @WLAN_SPLITMAC_ID: SplitMac * @WLAN_DEBUG_ID: Debug operations @@ -208,6 +210,8 @@ typedef void (*wlan_objmgr_peer_status_handler)( * @WLAN_DISA_ID: DISA (encryption test) operations * @WLAN_FTM_ID: FTM module * @WLAN_FD_ID: FILS Discovery + * @WLAN_OCB_NB_ID: OCB Northbound operations + * @WLAN_OCB_SB_ID: OCB Southbound operations * @WLAN_REF_ID_MAX: Max id used to generate ref count tracking array */ /* New value added to the enum must also be reflected in function @@ -248,7 +252,8 @@ typedef enum { WLAN_DISA_ID = 31, WLAN_FTM_ID = 32, WLAN_FD_ID = 33, - + WLAN_OCB_NB_ID = 34, + WLAN_OCB_SB_ID = 35, WLAN_REF_ID_MAX, } wlan_objmgr_ref_dbgid;