Updated include paths for the moved files under net/

core/net/rpl/rpl-dag.c

@@ -43,8 +43,8 @@
 
 #include "contiki.h"
 #include "net/rpl/rpl-private.h"
-#include "net/uip.h"
-#include "net/uip-nd6.h"
+#include "net/ip/uip.h"
+#include "net/ipv6/uip-nd6.h"
 #include "net/nbr-table.h"
 #include "lib/list.h"
 #include "lib/memb.h"
@@ -54,7 +54,7 @@
 #include <string.h>
 
 #define DEBUG DEBUG_NONE
-#include "net/uip-debug.h"
+#include "net/ip/uip-debug.h"
 
 #if UIP_CONF_IPV6
 /*---------------------------------------------------------------------------*/

core/net/rpl/rpl-ext-header.c

@@ -42,13 +42,13 @@
  *         Nicolas Tsiftes <nvt@sics.se>.
  */
 
-#include "net/uip.h"
-#include "net/tcpip.h"
-#include "net/uip-ds6.h"
+#include "net/ip/uip.h"
+#include "net/ip/tcpip.h"
+#include "net/ipv6/uip-ds6.h"
 #include "net/rpl/rpl-private.h"
 
 #define DEBUG DEBUG_NONE
-#include "net/uip-debug.h"
+#include "net/ip/uip-debug.h"
 
 #include <limits.h>
 #include <string.h>

core/net/rpl/rpl-icmp6.c

@@ -42,11 +42,11 @@
  *               Mathieu Pouillot <m.pouillot@watteco.com>
  */
 
-#include "net/tcpip.h"
-#include "net/uip.h"
-#include "net/uip-ds6.h"
-#include "net/uip-nd6.h"
-#include "net/uip-icmp6.h"
+#include "net/ip/tcpip.h"
+#include "net/ip/uip.h"
+#include "net/ipv6/uip-ds6.h"
+#include "net/ipv6/uip-nd6.h"
+#include "net/ipv6/uip-icmp6.h"
 #include "net/rpl/rpl-private.h"
 #include "net/packetbuf.h"
 
@@ -55,7 +55,7 @@
 
 #define DEBUG DEBUG_NONE
 
-#include "net/uip-debug.h"
+#include "net/ip/uip-debug.h"
 
 #if UIP_CONF_IPV6
 /*---------------------------------------------------------------------------*/

core/net/rpl/rpl-mrhof.c

@@ -48,7 +48,7 @@
 #include "net/nbr-table.h"
 
 #define DEBUG DEBUG_NONE
-#include "net/uip-debug.h"
+#include "net/ip/uip-debug.h"
 
 static void reset(rpl_dag_t *);
 static void neighbor_link_callback(rpl_parent_t *, int, int);

core/net/rpl/rpl-of0.c

@@ -42,7 +42,7 @@
 #include "net/rpl/rpl-private.h"
 
 #define DEBUG DEBUG_NONE
-#include "net/uip-debug.h"
+#include "net/ip/uip-debug.h"
 
 static void reset(rpl_dag_t *);
 static rpl_parent_t *best_parent(rpl_parent_t *, rpl_parent_t *);

core/net/rpl/rpl-private.h

@@ -40,10 +40,10 @@
 #include "net/rpl/rpl.h"
 
 #include "lib/list.h"
-#include "net/uip.h"
+#include "net/ip/uip.h"
 #include "sys/clock.h"
 #include "sys/ctimer.h"
-#include "net/uip-ds6.h"
+#include "net/ipv6/uip-ds6.h"
 
 /*---------------------------------------------------------------------------*/
 /** \brief Is IPv6 address addr the link-local, all-RPL-nodes

core/net/rpl/rpl-timers.c

@@ -47,7 +47,7 @@
 #if UIP_CONF_IPV6
 
 #define DEBUG DEBUG_NONE
-#include "net/uip-debug.h"
+#include "net/ip/uip-debug.h"
 
 /*---------------------------------------------------------------------------*/
 static struct ctimer periodic_timer;

core/net/rpl/rpl.c

@@ -40,13 +40,13 @@
  * \author Joakim Eriksson <joakime@sics.se>, Nicolas Tsiftes <nvt@sics.se>
  */
 
-#include "net/uip.h"
-#include "net/tcpip.h"
-#include "net/uip-ds6.h"
+#include "net/ip/uip.h"
+#include "net/ip/tcpip.h"
+#include "net/ipv6/uip-ds6.h"
 #include "net/rpl/rpl-private.h"
 
 #define DEBUG DEBUG_NONE
-#include "net/uip-debug.h"
+#include "net/ip/uip-debug.h"
 
 #include <limits.h>
 #include <string.h>

core/net/rpl/rpl.h

@@ -41,8 +41,8 @@
 #include "rpl-conf.h"
 
 #include "lib/list.h"
-#include "net/uip.h"
-#include "net/uip-ds6.h"
+#include "net/ip/uip.h"
+#include "net/ipv6/uip-ds6.h"
 #include "sys/ctimer.h"
 
 /*---------------------------------------------------------------------------*/