X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Fchips%2Fcc2420%2Fcsma%2FCC2420CsmaP.nc;h=42e087c86ed40bccdcddaa2e1932a6f7cabeaae3;hb=23631c164a541a13c35bc4cac67478f3c235c493;hp=82f4412ed12b6cf044a659ffa5cf12a5898e5b40;hpb=5683b66613c4182b6ec6a8e869bfa711c1f8b224;p=tinyos-2.x.git

diff --git a/tos/chips/cc2420/csma/CC2420CsmaP.nc b/tos/chips/cc2420/csma/CC2420CsmaP.nc
index 82f4412e..42e087c8 100644
--- a/tos/chips/cc2420/csma/CC2420CsmaP.nc
+++ b/tos/chips/cc2420/csma/CC2420CsmaP.nc
@@ -160,7 +160,7 @@ implementation {
 
   command void* Send.getPayload(message_t* m, uint8_t len) {
     if (len <= call Send.maxPayloadLength()) {
-      return (void* COUNT_NOK(len ))(CC2420_PAYLOAD(m));
+      return (void* COUNT_NOK(len ))(m->data);
     }
     else {
       return NULL;
@@ -168,7 +168,7 @@ implementation {
   }
 
   command uint8_t Send.maxPayloadLength() {
-    return TOSH_DATA_LENGTH + AM_OVERHEAD;
+    return TOSH_DATA_LENGTH;
   }
 
   /**************** RadioBackoff Commands ****************/