diff --git a/qdf/inc/qdf_status.h b/qdf/inc/qdf_status.h
index a8e00e79fb..8210212f81 100644
--- a/qdf/inc/qdf_status.h
+++ b/qdf/inc/qdf_status.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2014-2017 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -82,6 +82,10 @@
  * @QDF_STATUS_MAXCOMP_FAIL: Component id is more than MAX UMAC components
  * @QDF_STATUS_COMP_DISABLED: UMAC Component is disabled
  * @QDF_STATUS_COMP_ASYNC: UMAC component runs in asynchronous communication
+ * @QDF_STATUS_CRYPTO_PN_ERROR: PN ERROR in received frame
+ * @QDF_STATUS_CRYPTO_MIC_FAILURE: MIC failure in received frame
+ * @QDF_STATUS_CRYPTO_ENCRYPT_FAILED: encryption failed
+ * @QDF_STATUS_CRYPTO_DECRYPT_FAILED: decryption failed
  * @QDF_STATUS_MAX: not a realy value just a place holder for max
  */
 typedef enum {
@@ -131,6 +135,10 @@ typedef enum {
 	QDF_STATUS_MAXCOMP_FAIL,
 	QDF_STATUS_COMP_DISABLED,
 	QDF_STATUS_COMP_ASYNC,
+	QDF_STATUS_CRYPTO_PN_ERROR,
+	QDF_STATUS_CRYPTO_MIC_FAILURE,
+	QDF_STATUS_CRYPTO_ENCRYPT_FAILED,
+	QDF_STATUS_CRYPTO_DECRYPT_FAILED,
 	QDF_STATUS_MAX
 } QDF_STATUS;
 
diff --git a/umac/cmn_services/inc/wlan_cmn.h b/umac/cmn_services/inc/wlan_cmn.h
index 4fb14b9f34..7308796bb4 100644
--- a/umac/cmn_services/inc/wlan_cmn.h
+++ b/umac/cmn_services/inc/wlan_cmn.h
@@ -105,6 +105,7 @@
  * @WLAN_UMAC_COMP_WIFI_POS:    WIFI Positioning
  * @WLAN_UMAC_COMP_TDLS:     TDLS
  * @WLAN_UMAC_COMP_ATF:      Airtime Fairness
+ * @WLAN_UMAC_COMP_CRYPTO:      CRYPTO
  * @WLAN_UMAC_COMP_ID_MAX: Maximum components in UMAC
  *
  * This id is static.
@@ -123,6 +124,7 @@ enum wlan_umac_comp_id {
 	WLAN_UMAC_COMP_TDLS           = 9,
 	WLAN_UMAC_COMP_ATF            = 10,
 	WLAN_UMAC_COMP_REGULATORY     = 11,
+	WLAN_UMAC_COMP_CRYPTO         = 12,
 	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 ca8f6b9e8f..af9eacaf87 100644
--- a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_cmn.h
+++ b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_cmn.h
@@ -170,6 +170,7 @@ typedef void (*wlan_objmgr_peer_status_handler)(
  * @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_REF_ID_MAX:            Max id used to generate ref count tracking array
  */
 typedef enum {
@@ -191,7 +192,8 @@ typedef enum {
 	WLAN_P2P_ID           = 15,
 	WLAN_TDLS_SB_ID       = 16,
 	WLAN_TDLS_NB_ID       = 17,
-	WLAN_ATF_ID           = 19,
+	WLAN_ATF_ID           = 18,
+	WLAN_CRYPTO_ID        = 19,
 	WLAN_REF_ID_MAX,
 } wlan_objmgr_ref_dbgid;