make TinyOS 6LOWPAN network ID available in the header

diff --git a/tos/chips/rf2xx/layers/TinyosNetworkLayer.h b/tos/chips/rf2xx/layers/TinyosNetworkLayer.h
index 11693c7db0482a89ff3078140fc9158ea78043dc..5d29e5ec5e8b52b4e09d8357bfc2cad745be4f29 100644 (file)
--- a/tos/chips/rf2xx/layers/TinyosNetworkLayer.h
+++ b/tos/chips/rf2xx/layers/TinyosNetworkLayer.h
@@ -24,6 +24,10 @@
 #ifndef __TINYOSNETWORKLAYER_H__
 #define __TINYOSNETWORKLAYER_H__
 
+#ifndef TINYOS_6LOWPAN_NETWORK_ID
+#define TINYOS_6LOWPAN_NETWORK_ID 0x3f
+#endif
+
 typedef nx_struct network_header_t
 {
        nxle_uint8_t network;

diff --git a/tos/chips/rf2xx/layers/TinyosNetworkLayerC.nc b/tos/chips/rf2xx/layers/TinyosNetworkLayerC.nc
index 6757cbf71bfad36167250cedd33123bfd6727ca6..385527db9b17d150524bb05c6dc9ca8e6403239c 100644 (file)
--- a/tos/chips/rf2xx/layers/TinyosNetworkLayerC.nc
+++ b/tos/chips/rf2xx/layers/TinyosNetworkLayerC.nc
@@ -23,10 +23,6 @@
 
 #include <TinyosNetworkLayer.h>
 
-#ifndef TINYOS_6LOWPAN_NETWORK_ID
-#define TINYOS_6LOWPAN_NETWORK_ID 0x3f
-#endif
-
 /*
    If TFRAMES_ENABLED is defined, then only TinyOS frames will be supported
    (with no network byte). If IEEE154FRAMES_ENABLED, then only IEEE 802.15.4