[devel] [PATCH 6/8] plm: Use Node ID instead of slot and subslot to identify a node [#2742]

[Anders Widell]

---
 src/plm/common/plms.h   |  4 ++--
 src/plm/plmd/plms_mds.c | 15 +--------------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/src/plm/common/plms.h b/src/plm/common/plms.h
index d550ea06d..6523a92d6 100644
--- a/src/plm/common/plms.h
+++ b/src/plm/common/plms.h
@@ -257,8 +257,8 @@ typedef struct plms_cb {
   MDS_DEST mdest_id;
   MDS_DEST hrb_dest;
   V_DEST_RL mds_role;
-  SaUint32T plms_self_id;
-  SaUint32T plms_remote_id;
+  NCS_NODE_ID plms_self_id;
+  NCS_NODE_ID plms_remote_id;
   NCS_NODE_ID node_id;
 
   SaAmfHandleT amf_hdl; /*AMF handle, obtained thru AMF init */
diff --git a/src/plm/plmd/plms_mds.c b/src/plm/plmd/plms_mds.c
index 59536ab2b..1415fefe1 100644
--- a/src/plm/plmd/plms_mds.c
+++ b/src/plm/plmd/plms_mds.c
@@ -30,18 +30,6 @@ static SaUint32T plms_mds_rcv(MDS_CALLBACK_RECEIVE_INFO 
*rcv_info);
 static SaUint32T plms_mds_svc_evt(MDS_CALLBACK_SVC_EVENT_INFO *svc_evt);
 void plms_mds_unregister();
 
-/*****************************************************************************
- Name    :  plms_get_slot_and_subslot_id_from_node_id
-
- Description :  To get the physical slot & sbuslot unique  id from the node id
-
- Arguments   :
-*****************************************************************************/
-SaUint32T plms_get_slot_and_subslot_id_from_node_id(NCS_NODE_ID node_id)
-{
-       return GetSlotSubslotIdFromNodeId(node_id);
-}
-
 /****************************************************************************\
  PROCEDURE NAME : plms_mds_vdest_create
 
@@ -217,8 +205,7 @@ SaUint32T plms_mds_register()
        /* Get the node id of local PLMS */
        cb->node_id = m_NCS_GET_NODE_ID;
 
-       cb->plms_self_id =
-           plms_get_slot_and_subslot_id_from_node_id(cb->node_id);
+       cb->plms_self_id = cb->node_id;
        TRACE_5("NodeId:%x SelfId:%x", cb->node_id, cb->plms_self_id);
        TRACE_LEAVE();
        return NCSCC_RC_SUCCESS;
-- 
2.13.3


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel