Commit changes to remove warnings in TestSecurity/ and solve functioning issues with...

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

diff --git a/tos/chips/cc2420/receive/CC2420ReceiveP.nc b/tos/chips/cc2420/receive/CC2420ReceiveP.nc
index 7ea0957012c2b31bc5f5b58a2ed61f8d5d304283..4d9c055508a397292798b0fefba7a86af54b3c09 100644 (file)
--- a/tos/chips/cc2420/receive/CC2420ReceiveP.nc
+++ b/tos/chips/cc2420/receive/CC2420ReceiveP.nc
@@ -468,9 +468,9 @@ implementation {
 
          call CSN.clr();
 #ifndef TFRAMES_ENABLED
-         atomic call SECCTRL1.write(skip+11+sizeof(security_header_t))+((skip+11+sizeof(security_header_t))<<8);
+         atomic call SECCTRL1.write(skip+11+sizeof(security_header_t)+((skip+11+sizeof(security_header_t))<<8));
 #else
-         atomic call SECCTRL1.write(skip+10+sizeof(security_header_t))+((skip+10+sizeof(security_header_t))<<8);
+         atomic call SECCTRL1.write(skip+10+sizeof(security_header_t)+((skip+10+sizeof(security_header_t))<<8));
 #endif
          call CSN.set();
 
@@ -693,7 +693,7 @@ implementation {
       securityOn = 0;
       authentication = 0;
 #endif
-      m_p_rx_buf = signal Receive.receive( m_p_rx_buf, CC2420_PAYLOAD(m_p_rx_buf),
+      m_p_rx_buf = signal Receive.receive( m_p_rx_buf, m_p_rx_buf->data,
                                           length - CC2420_SIZE);
     }
     atomic receivingPacket = FALSE;