Updated include paths for the moved files under net/

core/net/ipv4/uaodv-def.h

@@ -40,7 +40,7 @@
 #ifndef UAODV_DEF_H_
 #define UAODV_DEF_H_
 
-#include "net/uip.h"
+#include "net/ip/uip.h"
 
 #define NUM_PRECURSORS 4
 

core/net/ipv4/uaodv-rt.c

@@ -38,7 +38,7 @@
  */
 
 
-#include "net/uaodv-rt.h"
+#include "net/ipv4/uaodv-rt.h"
 #include "contiki-net.h"
 
 #ifndef UAODV_NUM_RT_ENTRIES

core/net/ipv4/uaodv.c

@@ -41,8 +41,8 @@
 #include <stdarg.h>
 
 #include "contiki.h"
-#include "net/uaodv-def.h"
-#include "net/uaodv-rt.h"
+#include "net/ipv4/uaodv-def.h"
+#include "net/ipv4/uaodv-rt.h"
 
 #define NDEBUG
 #include "lib/assert.h"

core/net/ipv4/uip-fw-drv.c

@@ -32,7 +32,7 @@
  *
  */
 
-#include "net/uip-fw.h"
+#include "net/ipv4/uip-fw.h"
 
 #if !UIP_CONF_IPV6
 

core/net/ipv4/uip-fw-drv.h

@@ -35,7 +35,7 @@
 #define UIP_FW_DRV_H_
 
 #include "contiki.h"
-#include "net/uip-fw.h"
+#include "net/ipv4/uip-fw.h"
 
 PROCESS_NAME(uip_fw_process);
 

core/net/ipv4/uip-fw.c

@@ -56,11 +56,11 @@
 
 #include "contiki-conf.h"
 
-#include "net/uip.h"
-#include "net/uip_arch.h"
-#include "net/uip-fw.h"
+#include "net/ip/uip.h"
+#include "net/ip/uip_arch.h"
+#include "net/ipv4/uip-fw.h"
 #ifdef AODV_COMPLIANCE
-#include "net/uaodv-def.h"
+#include "net/ipv4/uaodv-def.h"
 #endif
 
 /*

core/net/ipv4/uip-fw.h

@@ -45,7 +45,7 @@
 #ifndef UIP_FW_H_
 #define UIP_FW_H_
 
-#include "net/uip.h"
+#include "net/ip/uip.h"
 
 /**
  * Representation of a uIP network interface.

core/net/ipv4/uip-neighbor.c

@@ -38,7 +38,7 @@
  *         Adam Dunkels <adam@sics.se>
  */
 
-#include "net/uip-neighbor.h"
+#include "net/ipv4/uip-neighbor.h"
 
 #include <string.h>
 #include <stdio.h>

core/net/ipv4/uip-neighbor.h

@@ -41,7 +41,7 @@
 #ifndef UIP_NEIGHBOR_H_
 #define UIP_NEIGHBOR_H_
 
-#include "net/uip.h"
+#include "net/ip/uip.h"
 
 struct uip_neighbor_addr {
 #if UIP_NEIGHBOR_CONF_ADDRTYPE

core/net/ipv4/uip-over-mesh.c

@@ -39,8 +39,8 @@
 
 #include <stdio.h>
 
-#include "net/uip-fw.h"
-#include "net/uip-over-mesh.h"
+#include "net/ipv4/uip-fw.h"
+#include "net/ipv4/uip-over-mesh.h"
 #include "net/rime/route-discovery.h"
 #include "net/rime/route.h"
 #include "net/rime/trickle.h"

core/net/ipv4/uip-over-mesh.h

@@ -40,8 +40,8 @@
 #ifndef UIP_OVER_MESH_H_
 #define UIP_OVER_MESH_H_
 
-#include "net/uip.h"
-#include "net/uip-fw.h"
+#include "net/ip/uip.h"
+#include "net/ipv4/uip-fw.h"
 #include "net/rime.h"
 
 void uip_over_mesh_init(uint16_t channels);

core/net/ipv4/uip.c

@@ -70,10 +70,10 @@
  * the packet back to the peer.
 */
 
-#include "net/uip.h"
-#include "net/uipopt.h"
-#include "net/uip_arp.h"
-#include "net/uip_arch.h"
+#include "net/ip/uip.h"
+#include "net/ip/uipopt.h"
+#include "net/ipv4/uip_arp.h"
+#include "net/ip/uip_arch.h"
 
 #if !UIP_CONF_IPV6 /* If UIP_CONF_IPV6 is defined, we compile the
 		      uip6.c file instead of this one. Therefore
@@ -82,7 +82,7 @@
 
 
 #if UIP_CONF_IPV6
-#include "net/uip-neighbor.h"
+#include "net/ipv4/uip-neighbor.h"
 #endif /* UIP_CONF_IPV6 */
 
 #include <string.h>

core/net/ipv4/uip_arp.c

@@ -58,7 +58,7 @@
  */
 
 
-#include "net/uip_arp.h"
+#include "net/ipv4/uip_arp.h"
 
 #include <string.h>
 

core/net/ipv4/uip_arp.h

@@ -51,7 +51,7 @@
 #ifndef UIP_ARP_H_
 #define UIP_ARP_H_
 
-#include "net/uip.h"
+#include "net/ip/uip.h"