cleanup some offsets in the cc2420 stack

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

diff --git a/tos/chips/cc2420/CC2420Ieee154MessageP.nc b/tos/chips/cc2420/CC2420Ieee154MessageP.nc
index d1abc75010668d97ab7ff81283b5d5d2d4dfd9ab..26299430d50a442b0138cb10464628bb869ae4e5 100644 (file)
--- a/tos/chips/cc2420/CC2420Ieee154MessageP.nc
+++ b/tos/chips/cc2420/CC2420Ieee154MessageP.nc
@@ -144,11 +144,11 @@ implementation {
   }
   
   command uint8_t Packet.payloadLength(message_t* msg) {
-    return (call CC2420PacketBody.getHeader(msg))->length - CC2420_SIZE;
+    return (call CC2420PacketBody.getHeader(msg))->length - CC2420_SIZE + AM_OVERHEAD;
   }
   
   command void Packet.setPayloadLength(message_t* msg, uint8_t len) {
-    (call CC2420PacketBody.getHeader(msg))->length  = len + CC2420_SIZE;
+    (call CC2420PacketBody.getHeader(msg))->length  = len + CC2420_SIZE - AM_OVERHEAD;
   }
   
   command uint8_t Packet.maxPayloadLength() {