From: sdhsdh <sdhsdh>
Date: Sat, 29 Aug 2009 04:21:37 +0000 (+0000)
Subject:  fix OOPS when merging with security code
X-Git-Tag: rc_6_tinyos_2_1_1~323
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=21657e1611a52df17c45f74b043ad8e78e3baae0

 fix OOPS when merging with security code
---

diff --git a/tos/chips/cc2420/CC2420.h b/tos/chips/cc2420/CC2420.h
index d554f2d9..91138798 100644
--- a/tos/chips/cc2420/CC2420.h
+++ b/tos/chips/cc2420/CC2420.h
@@ -104,6 +104,9 @@ typedef nx_struct cc2420_header_t {
   nxle_uint16_t dest;
   nxle_uint16_t src;
   /** CC2420 802.15.4 header ends here */
+#ifdef CC2420_HW_SECURITY
+  security_header_t secHdr;
+#endif
   
 #ifdef CC2420_IFRAME_TYPE
   /** I-Frame 6LowPAN interoperability byte */
@@ -114,10 +117,6 @@ typedef nx_struct cc2420_header_t {
   nxle_uint8_t type;
 #endif
 
-#ifdef CC2420_HW_SECURITY
-  security_header_t secHdr;
-#endif
-
 } cc2420_header_t;
 
 /**