From: idgay <idgay>
Date: Fri, 20 Jun 2008 21:38:36 +0000 (+0000)
Subject: m_msg can be null (before first send)
X-Git-Tag: release_tinyos_2_1_0_0~218
X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=commitdiff_plain;h=8a86e513ccf392d80fe06de577ce3b61d74b1656;p=tinyos-2.x.git

m_msg can be null (before first send)
---

diff --git a/tos/chips/cc2420/transmit/CC2420TransmitP.nc b/tos/chips/cc2420/transmit/CC2420TransmitP.nc
index 17653d65..7c07cab7 100644
--- a/tos/chips/cc2420/transmit/CC2420TransmitP.nc
+++ b/tos/chips/cc2420/transmit/CC2420TransmitP.nc
@@ -327,7 +327,8 @@ implementation {
         m_receiving = FALSE;
         if ( time - m_prev_time < 10 ) {
           call CC2420Receive.sfd_dropped();
-          call PacketTimeStamp.clear(m_msg);
+	  if (m_msg)
+	    call PacketTimeStamp.clear(m_msg);
         }
         break;
       
@@ -355,7 +356,7 @@ implementation {
     uint8_t* ack_buf;
     uint8_t length;
 
-    if ( type == IEEE154_TYPE_ACK ) {
+    if ( type == IEEE154_TYPE_ACK && m_msg) {
       ack_header = call CC2420PacketBody.getHeader( ack_msg );
       msg_header = call CC2420PacketBody.getHeader( m_msg );