From b15198b9a885ceeccc7d34c4251219231404ce3d Mon Sep 17 00:00:00 2001
From: adamdunkels <adamdunkels>
Date: Tue, 10 Feb 2009 23:49:58 +0000
Subject: [PATCH] Bugfix: the Chameleon header parser modules should not clear
 the packet attributes, because the MAC or radio layers may have added
 attributes already

---
 core/net/rime/chameleon-bitopt.c | 3 +--
 core/net/rime/chameleon-raw.c    | 5 ++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/core/net/rime/chameleon-bitopt.c b/core/net/rime/chameleon-bitopt.c
index 7071a7b7b..486b01212 100644
--- a/core/net/rime/chameleon-bitopt.c
+++ b/core/net/rime/chameleon-bitopt.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: chameleon-bitopt.c,v 1.5 2008/07/03 07:38:52 adamdunkels Exp $
+ * $Id: chameleon-bitopt.c,v 1.6 2009/02/10 23:49:58 adamdunkels Exp $
  */
 
 /**
@@ -295,7 +295,6 @@ unpack_header(void)
     return NULL;
   }
 
-  rimebuf_attr_clear();
   hdrptr = rimebuf_dataptr();
   hdrbytesize = c->hdrsize / 8 + ((c->hdrsize & 7) == 0? 0: 1);
   rimebuf_hdrreduce(hdrbytesize);
diff --git a/core/net/rime/chameleon-raw.c b/core/net/rime/chameleon-raw.c
index cfda31ad6..7c580b7df 100644
--- a/core/net/rime/chameleon-raw.c
+++ b/core/net/rime/chameleon-raw.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: chameleon-raw.c,v 1.3 2008/07/03 21:34:12 adamdunkels Exp $
+ * $Id: chameleon-raw.c,v 1.4 2009/02/10 23:49:58 adamdunkels Exp $
  */
 
 /**
@@ -74,8 +74,7 @@ input(void)
     PRINTF("chameleon-raw: input: channel %d not found\n", hdr->channel);
     return NULL;
   }
-  
-  rimebuf_attr_clear();
+
   hdrptr = rimebuf_dataptr();
   rimebuf_hdrreduce(c->hdrsize);
   byteptr = bitptr = 0;