From b41b79e3a91b6d7cc9154e21e97c5fd500c00d47 Mon Sep 17 00:00:00 2001
From: nifi <nifi>
Date: Mon, 6 Apr 2009 17:18:20 +0000
Subject: [PATCH] Disable timestamp when using 802.15.4 frames
 (CC2420_CONF_TIMESTAMPS adds timestamp to radio packets).

---
 platform/sky/contiki-conf.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/platform/sky/contiki-conf.h b/platform/sky/contiki-conf.h
index 1abed6952..a74616f39 100644
--- a/platform/sky/contiki-conf.h
+++ b/platform/sky/contiki-conf.h
@@ -1,5 +1,5 @@
 /* -*- C -*- */
-/* @(#)$Id: contiki-conf.h,v 1.47 2009/04/06 16:01:11 nifi Exp $ */
+/* @(#)$Id: contiki-conf.h,v 1.48 2009/04/06 17:18:20 nifi Exp $ */
 
 #ifndef CONTIKI_CONF_H
 #define CONTIKI_CONF_H
@@ -19,8 +19,10 @@
 #define DCOSYNCH_CONF_ENABLED 1
 #define DCOSYNCH_CONF_PERIOD 30
 
+#ifndef WITH_UIP6
 #define TIMESYNCH_CONF_ENABLED 1
 #define CC2420_CONF_TIMESTAMPS 1
+#endif /* !WITH_UIP6 */
 
 #define CFS_CONF_OFFSET_TYPE	long