From: vlahan <vlahan>
Date: Wed, 13 Dec 2006 01:56:41 +0000 (+0000)
Subject: Hand-merging changes from tinyos-2-0-0-release that were never propagated to DEVEL... 
X-Git-Tag: tinyos/2.0.1~254
X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=commitdiff_plain;h=3fff77df15df5a3d2ee609ba925323fba5b693a2;p=tinyos-2.x.git

Hand-merging changes from tinyos-2-0-0-release that were never propagated to DEVEL before the DEVEL/HEAD switch
---

diff --git a/tos/lib/net/DisseminationEngineImplP.nc b/tos/lib/net/DisseminationEngineImplP.nc
index 04a044a4..4bdd4a11 100644
--- a/tos/lib/net/DisseminationEngineImplP.nc
+++ b/tos/lib/net/DisseminationEngineImplP.nc
@@ -87,7 +87,6 @@ implementation {
 
   event void TrickleTimer.fired[ uint16_t key ]() {
 
-    call Leds.led2Toggle();
 
     if ( m_bufBusy ) { return; }
 
diff --git a/tos/lib/net/ctp/CtpForwardingEngineP.nc b/tos/lib/net/ctp/CtpForwardingEngineP.nc
index f62ac97e..09eef878 100644
--- a/tos/lib/net/ctp/CtpForwardingEngineP.nc
+++ b/tos/lib/net/ctp/CtpForwardingEngineP.nc
@@ -619,7 +619,6 @@ implementation {
         call CollectionDebug.logEvent(NET_C_FE_PUT_QEPOOL_ERR);
       sending = FALSE;
       startRetxmitTimer(SENDDONE_OK_WINDOW, SENDDONE_OK_OFFSET);
-      call Leds.led2Toggle();
     }
     else {
       dbg("Forwarder", "%s: BUG: we have a pool entry, but the pool is full, client is %hhu.\n", __FUNCTION__, qe->client);