From be3d5e83943586f49a518d3e1ccdd3ffdb493642 Mon Sep 17 00:00:00 2001
From: bg- <bg->
Date: Mon, 21 May 2007 14:13:04 +0000
Subject: [PATCH] * s/uip-fw-service/uip-fw-drv/

---
 core/contiki-net.h           | 6 ++----
 platform/cc2420dbk/gateway.c | 6 +++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/core/contiki-net.h b/core/contiki-net.h
index a829187a0..37460e749 100644
--- a/core/contiki-net.h
+++ b/core/contiki-net.h
@@ -30,7 +30,7 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: contiki-net.h,v 1.3 2007/05/15 07:47:54 adamdunkels Exp $
+ * $Id: contiki-net.h,v 1.4 2007/05/21 14:13:04 bg- Exp $
  */
 #ifndef __CONTIKI_NET_H__
 #define __CONTIKI_NET_H__
@@ -41,7 +41,7 @@
 
 #include "net/uip.h"
 #include "net/uip-fw.h"
-#include "net/uip-fw-service.h"
+#include "net/uip-fw-drv.h"
 #include "net/uip_arp.h"
 #include "net/uipbuf.h"
 #include "net/uiplib.h"
@@ -49,8 +49,6 @@
 
 #include "net/resolv.h"
 
-#include "net/packet-service.h"
-
 #include "net/psock.h"
 
 #include "net/rime.h"
diff --git a/platform/cc2420dbk/gateway.c b/platform/cc2420dbk/gateway.c
index d65df864b..ad5ed18e6 100644
--- a/platform/cc2420dbk/gateway.c
+++ b/platform/cc2420dbk/gateway.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE. 
  *
- * @(#)$Id: gateway.c,v 1.2 2007/04/11 10:14:00 bg- Exp $
+ * @(#)$Id: gateway.c,v 1.3 2007/05/21 14:14:16 bg- Exp $
  */
 
 /*
@@ -60,7 +60,7 @@
 #include "contiki.h"
 
 /* Also IP output. */
-#include "net/uip-fw-service.h"
+#include "net/uip-fw-drv.h"
 #include "net/uaodv.h"
 #include "dev/slip.h"
 #include "dev/cc2420.h"
@@ -110,7 +110,7 @@ main(int argc, char **argv)
   leds_toggle(LEDS_ALL);
   slip_arch_init(BAUD2UBR(38400)); /* Must come before first printf */
   printf("Starting %s "
-         "($Id: gateway.c,v 1.2 2007/04/11 10:14:00 bg- Exp $)\n", __FILE__);
+         "($Id: gateway.c,v 1.3 2007/05/21 14:14:16 bg- Exp $)\n", __FILE__);
   ds2411_init();
   cc2420_init();
   xmem_init();