fix OOPS when merging with security code

diff --git a/tos/chips/cc2420/CC2420.h b/tos/chips/cc2420/CC2420.h
index d554f2d92a21aeabdfaa1029ee3a544ab44836d3..91138798702f948c122b7e650d5852b4b2bc3ae8 100644 (file)
--- 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;
 
 /**