From d5291320027045c65a2038d7086fe0ad0c2fb0ef Mon Sep 17 00:00:00 2001
From: nvt-se <nvt-se>
Date: Fri, 30 Apr 2010 15:06:00 +0000
Subject: [PATCH] Added missing parts of the RPL configuration

---
 platform/sky/contiki-conf.h | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/platform/sky/contiki-conf.h b/platform/sky/contiki-conf.h
index 29550aeec..efafac449 100644
--- a/platform/sky/contiki-conf.h
+++ b/platform/sky/contiki-conf.h
@@ -1,5 +1,5 @@
 /* -*- C -*- */
-/* @(#)$Id: contiki-conf.h,v 1.77 2010/04/30 13:52:14 joxe Exp $ */
+/* @(#)$Id: contiki-conf.h,v 1.78 2010/04/30 15:06:00 nvt-se Exp $ */
 
 #ifndef CONTIKI_CONF_H
 #define CONTIKI_CONF_H
@@ -23,6 +23,8 @@
 #define CXMAC_CONF_ANNOUNCEMENTS         0
 #define XMAC_CONF_ANNOUNCEMENTS          0
 
+#define QUEUEBUF_CONF_NUM                8
+
 #else /* WITH_UIP6 */
 
 /* Network setup for non-IPv6 (rime). */
@@ -49,10 +51,10 @@
 
 #define COLLECT_NEIGHBOR_CONF_MAX_NEIGHBORS      32
 
-#endif /* WITH_UIP6 */
-
 #define QUEUEBUF_CONF_NUM          16
 
+#endif /* WITH_UIP6 */
+
 #define PACKETBUF_CONF_ATTRS_INLINE 1
 
 #ifndef RF_CHANNEL
@@ -119,6 +121,25 @@
 #define UIP_CONF_ROUTER                 1
 #define UIP_CONF_IPV6_RPL               1
 
+/* Handle 10 neighbors */
+#define UIP_CONF_DS6_NBR_NBU     10
+/* Handle 10 routes    */
+#define UIP_CONF_DS6_ROUTE_NBU   10
+
+#define UIP_DS6_ROUTE_STATE_TYPE rpl_route_entry_t
+/* Needed for the extended route entry state */
+typedef struct rpl_route_entry {
+  uint32_t lifetime;
+  uint32_t saved_lifetime;
+  void *dag;
+  uint8_t learned_from;
+} rpl_route_entry_t;
+
+#define UIP_CONF_DS6_NEIGHBOR_STATE_CHANGED rpl_ds6_neighbor_callback
+
+#define UIP_CONF_ND6_SEND_RA		0
+#define UIP_CONF_ND6_REACHABLE_TIME     600000
+#define UIP_CONF_ND6_RETRANS_TIMER      10000
 
 #define UIP_CONF_IPV6                   1
 #define UIP_CONF_IPV6_QUEUE_PKT         1