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

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

diff --git a/src/lss.c b/src/lss.c
index b47daeb..1dee612 100644
--- a/src/lss.c
+++ b/src/lss.c
@@ -36,13 +36,14 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
 */
 
-#ifdef CO_ENABLE_LSS
 
 #include "data.h"
 #include "lss.h"
 #include "canfestival.h"
 #include "sysdep.h"
 
+#ifdef CO_ENABLE_LSS
+
 //#define LSS_TIMEOUT_MS	(TIMEVAL)1000  /* ms */
 //#define LSS_FS_TIMEOUT_MS	(TIMEVAL)100  /* ms */
 
@@ -645,7 +646,6 @@ UNS8 proceedLSS_Slave(CO_Data* d, Message* m )
 					setState(d, Initialisation);
 				}
 				else{/* The nodeID will be changed on NMT_Reset Request*/
-					setNodeId(d, d->lss_transfer.nodeID);
 				}
 			}
 			d->lss_transfer.mode=LSS_WAITING_MODE;
diff --git a/src/nmtSlave.c b/src/nmtSlave.c
index e9bce15..ac79788 100644
--- a/src/nmtSlave.c
+++ b/src/nmtSlave.c
@@ -75,10 +75,6 @@ void proceedNMTstateChange(CO_Data* d, Message *m)
       case NMT_Reset_Node:
          if(d->NMT_Slave_Node_Reset_Callback != NULL)
             d->NMT_Slave_Node_Reset_Callback(d);
-#ifdef CO_ENABLE_LSS
-  		if(getNodeId(d)!=d->lss_transfer.nodeID)
-  			setNodeId(d, d->lss_transfer.nodeID);
-#endif
         setState(d,Initialisation);
         break;
 
-- 
2.39.2