From 9c3008042e36a7bbaf4304d141a2fcfaf36c9395 Mon Sep 17 00:00:00 2001
From: etisserant <etisserant>
Date: Mon, 23 Jun 2008 15:54:18 +0000
Subject: [PATCH] LSS patch from Edward. Now, SetNodeId is not called from
 nmtslave anymore in case of LSS.

---
 src/nmtSlave.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/nmtSlave.c b/src/nmtSlave.c
index ac79788..dd72100 100644
--- a/src/nmtSlave.c
+++ b/src/nmtSlave.c
@@ -82,8 +82,10 @@ void proceedNMTstateChange(CO_Data* d, Message *m)
          if(d->NMT_Slave_Communications_Reset_Callback != NULL)
             d->NMT_Slave_Communications_Reset_Callback(d);
 #ifdef CO_ENABLE_LSS
-  		if(getNodeId(d)!=d->lss_transfer.nodeID && getNodeId(d)>0 && getNodeId(d)<=127)
-  			setNodeId(d, d->lss_transfer.nodeID);
+         // LSS changes NodeId here in case lss_transfer.nodeID
+         // doesn't match current getNodeId()
+         if(newNodeId!=d->lss_transfer.nodeID && newNodeId>0 && newNodeId<=127 )
+            newNodeId = d->lss_transfer.nodeID;
 #endif
         setState(d,Initialisation);
         break;
-- 
2.39.2