X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Fchips%2Fcc2420%2FCC2420Ieee154MessageP.nc;h=26299430d50a442b0138cb10464628bb869ae4e5;hb=23631c164a541a13c35bc4cac67478f3c235c493;hp=d1abc75010668d97ab7ff81283b5d5d2d4dfd9ab;hpb=5683b66613c4182b6ec6a8e869bfa711c1f8b224;p=tinyos-2.x.git

diff --git a/tos/chips/cc2420/CC2420Ieee154MessageP.nc b/tos/chips/cc2420/CC2420Ieee154MessageP.nc
index d1abc750..26299430 100644
--- 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() {