cleanup some offsets in the cc2420 stack

[tinyos-2.x.git] / tos / chips / cc2420 / packet / CC2420PacketP.nc

diff --git a/tos/chips/cc2420/packet/CC2420PacketP.nc b/tos/chips/cc2420/packet/CC2420PacketP.nc
index ec4b50df881ea5c91e1a9ff018cf836f2793d735..50b138fcf19280a03a228bb5e6d5718cf3663a77 100644 (file)
--- a/tos/chips/cc2420/packet/CC2420PacketP.nc
+++ b/tos/chips/cc2420/packet/CC2420PacketP.nc
@@ -96,17 +96,15 @@ implementation {
   }
 
   async command uint8_t CC2420Packet.getNetwork( message_t* p_msg ) {
-#if defined(CC2420_IFRAME_TYPE)
-    return (call CC2420PacketBody.getHeader( p_msg ))->network;
-#elif defined(IEEE154FRAMES_ENABLED)
-    return 0;
-#else
+#if defined(TFRAMES_ENABLED)
     return TINYOS_6LOWPAN_NETWORK_ID;
+#else
+    return (call CC2420PacketBody.getHeader( p_msg ))->network;
 #endif
   }
 
   async command void CC2420Packet.setNetwork( message_t* p_msg , uint8_t networkId ) {
-#if defined(CC2420_IFRAME_TYPE)
+#if ! defined(TFRAMES_ENABLED)
     (call CC2420PacketBody.getHeader( p_msg ))->network = networkId;
 #endif
   }