Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / chips / cc2420 / link / PacketLinkP.nc

diff --git a/tos/chips/cc2420/link/PacketLinkP.nc b/tos/chips/cc2420/link/PacketLinkP.nc
index fef6c2bf21319875071874da366c9e5914e25645..0622fcda04cd418f69e83fe633c7202f9b26efff 100644 (file)
--- a/tos/chips/cc2420/link/PacketLinkP.nc
+++ b/tos/chips/cc2420/link/PacketLinkP.nc
@@ -48,7 +48,6 @@ module PacketLinkP {
     interface State as SendState;
     interface PacketAcknowledgements;
     interface Timer<TMilli> as DelayTimer;
-    interface AMPacket;
     interface CC2420PacketBody;
   }
 }
@@ -221,6 +220,7 @@ implementation {
   void signalDone(error_t error) {
     call DelayTimer.stop();
     call SendState.toIdle();
+    (call CC2420PacketBody.getMetadata(currentSendMsg))->maxRetries = totalRetries;
     signal Send.sendDone(currentSendMsg, error);
   }
 }