From 0bb803fb7edbb02294619c25070e1a8b4f12c66c Mon Sep 17 00:00:00 2001
From: Krunal Soni <ksoni@codeaurora.org>
Date: Fri, 17 Feb 2017 17:20:25 -0800
Subject: [PATCH] qcacmn: Fix compilation error caused by object manager API
 change

Object manager's API definition has been changed which causes
compilation error in serialization module. Fix the compilation.

Change-Id: I89cd20c12579f927984ca4c94cf6155ea567b9d7
CRs-Fixed: 2000032
---
 .../obj_mgr/inc/wlan_objmgr_cmn.h             | 20 ++++++++++---------
 .../src/wlan_serialization_dequeue.c          |  4 ++--
 .../src/wlan_serialization_utils.c            |  2 +-
 3 files changed, 14 insertions(+), 12 deletions(-)

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 ee3a14e0f8e9..2e97c255acd0 100644
--- a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_cmn.h
+++ b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_cmn.h
@@ -161,18 +161,20 @@ typedef void (*wlan_objmgr_peer_status_handler)(
  * @WLAN_OSIF_ID:               New component's OS IF ID
  * @WLAN_LEGACY_MAC_ID:         Legacy MAC operations
  * @WLAN_LEGACY_WMA_ID:         Legacy WMA operations
+ * @WLAN_SERIALIZATION_ID:      Serialization operations
  * @WLAN_REF_ID_MAX:            Max id used to generate ref count tracking array
  */
 typedef enum {
-	WLAN_OBJMGR_ID      = 0,
-	WLAN_MLME_SB_ID     = 1,
-	WLAN_MLME_NB_ID     = 2,
-	WLAN_MGMT_SB_ID     = 3,
-	WLAN_MGMT_NB_ID     = 4,
-	WLAN_HDD_ID_OBJ_MGR = 5,
-	WLAN_OSIF_ID        = 6,
-	WLAN_LEGACY_MAC_ID  = 7,
-	WLAN_LEGACY_WMA_ID  = 8,
+	WLAN_OBJMGR_ID        = 0,
+	WLAN_MLME_SB_ID       = 1,
+	WLAN_MLME_NB_ID       = 2,
+	WLAN_MGMT_SB_ID       = 3,
+	WLAN_MGMT_NB_ID       = 4,
+	WLAN_HDD_ID_OBJ_MGR   = 5,
+	WLAN_OSIF_ID          = 6,
+	WLAN_LEGACY_MAC_ID    = 7,
+	WLAN_LEGACY_WMA_ID    = 8,
+	WLAN_SERIALIZATION_ID = 9,
 	WLAN_REF_ID_MAX,
 } wlan_objmgr_ref_dbgid;
 
diff --git a/umac/cmn_services/serialization/src/wlan_serialization_dequeue.c b/umac/cmn_services/serialization/src/wlan_serialization_dequeue.c
index acc6acc77028..2303339ec1d2 100644
--- a/umac/cmn_services/serialization/src/wlan_serialization_dequeue.c
+++ b/umac/cmn_services/serialization/src/wlan_serialization_dequeue.c
@@ -345,11 +345,11 @@ wlan_serialization_is_cmd_removed(struct wlan_objmgr_psoc *psoc,
 	if (check_active_queue)
 		wlan_objmgr_iterate_obj_list(psoc, WLAN_PDEV_OP,
 			wlan_serialization_remove_cmd_from_active_queue,
-				cmd, 0);
+				cmd, 0, WLAN_SERIALIZATION_ID);
 	else
 		wlan_objmgr_iterate_obj_list(psoc, WLAN_PDEV_OP,
 			wlan_serialization_remove_cmd_from_pending_queue,
-			cmd, 0);
+			cmd, 0, WLAN_SERIALIZATION_ID);
 
 	if (cmd->vdev == NULL)
 		return true;
diff --git a/umac/cmn_services/serialization/src/wlan_serialization_utils.c b/umac/cmn_services/serialization/src/wlan_serialization_utils.c
index 2423616246eb..4b264857544f 100644
--- a/umac/cmn_services/serialization/src/wlan_serialization_utils.c
+++ b/umac/cmn_services/serialization/src/wlan_serialization_utils.c
@@ -376,7 +376,7 @@ wlan_serialization_is_active_scan_cmd_allowed(struct wlan_objmgr_pdev *pdev)
 
 	wlan_objmgr_iterate_obj_list(psoc, WLAN_PDEV_OP,
 			wlan_serialization_active_scan_cmd_count_handler,
-			&count, 0);
+			&count, 0, WLAN_SERIALIZATION_ID);
 	if (count < WLAN_SERIALIZATION_MAX_ACTIVE_SCAN_CMDS) {
 		serialization_notice("count is [%d]", count);
 		return true;