From 250707c2d76e58d775539e7bce42e95e2f4ea03f Mon Sep 17 00:00:00 2001 From: Simon Duquennoy Date: Thu, 22 Jun 2017 09:49:01 +0200 Subject: [PATCH] Use full include path for rpl and rpl-lite .h files, in core --- core/net/ip/tcpip.c | 14 ++++++-------- core/net/ipv6/multicast/esmrf.c | 7 ++++++- core/net/ipv6/multicast/smrf.c | 6 +++++- core/net/ipv6/uip-ds6-route.h | 6 +++++- core/net/ipv6/uip-icmp6.c | 10 ++++++---- core/net/ipv6/uip6.c | 10 ++++++---- core/net/mac/tsch/tsch-rpl.c | 10 ++++++---- core/net/mac/tsch/tsch-rpl.h | 6 +++++- core/net/rpl-lite/rpl-dag-root.c | 2 +- core/net/rpl-lite/rpl-dag.c | 2 +- core/net/rpl-lite/rpl-ext-header.c | 2 +- core/net/rpl-lite/rpl-icmp6.c | 2 +- core/net/rpl-lite/rpl-mrhof.c | 2 +- core/net/rpl-lite/rpl-nbr-policy.c | 2 +- core/net/rpl-lite/rpl-neighbor.c | 2 +- core/net/rpl-lite/rpl-neighbor.h | 2 +- core/net/rpl-lite/rpl-ns.c | 2 +- core/net/rpl-lite/rpl-ns.h | 4 ++-- core/net/rpl-lite/rpl-of0.c | 2 +- core/net/rpl-lite/rpl-timers.c | 2 +- core/net/rpl-lite/rpl-timers.h | 2 +- core/net/rpl-lite/rpl.c | 2 +- core/net/rpl-lite/rpl.h | 22 +++++++++++----------- core/net/rpl/rpl-dag-root.c | 6 +++--- core/net/rpl/rpl-dag.c | 2 +- core/net/rpl/rpl-ext-header.c | 4 ++-- core/net/rpl/rpl-icmp6.c | 4 ++-- core/net/rpl/rpl-mrhof.c | 4 ++-- core/net/rpl/rpl-nbr-policy.c | 2 +- core/net/rpl/rpl-ns.c | 6 +++--- core/net/rpl/rpl-ns.h | 2 +- core/net/rpl/rpl-of0.c | 4 ++-- core/net/rpl/rpl-private.h | 6 +++--- core/net/rpl/rpl-timers.c | 4 ++-- core/net/rpl/rpl.c | 4 ++-- core/net/rpl/rpl.h | 2 +- 36 files changed, 96 insertions(+), 75 deletions(-) diff --git a/core/net/ip/tcpip.c b/core/net/ip/tcpip.c index 252efc072..0c2936ac2 100644 --- a/core/net/ip/tcpip.c +++ b/core/net/ip/tcpip.c @@ -45,10 +45,12 @@ #include "net/ipv6/uip-ds6.h" #if UIP_CONF_IPV6_RPL -#include "rpl.h" -#if UIP_CONF_IPV6_RPL_LITE == 0 -#include "rpl-private.h" -#endif /* UIP_CONF_IPV6_RPL_LITE == 0 */ +#if UIP_CONF_IPV6_RPL_LITE == 1 +#include "net/rpl-lite/rpl.h" +#else /* UIP_CONF_IPV6_RPL_LITE == 1 */ +#include "net/rpl/rpl.h" +#include "net/rpl/rpl-private.h" +#endif /* UIP_CONF_IPV6_RPL_LITE == 1 */ #endif #include @@ -66,10 +68,6 @@ extern struct uip_fallback_interface UIP_FALLBACK_INTERFACE; #endif -#if UIP_CONF_IPV6_RPL -#include "rpl.h" -#endif - process_event_t tcpip_event; #if UIP_CONF_ICMP6 process_event_t tcpip_icmp6_event; diff --git a/core/net/ipv6/multicast/esmrf.c b/core/net/ipv6/multicast/esmrf.c index 0aa047f0b..bdac61d9d 100644 --- a/core/net/ipv6/multicast/esmrf.c +++ b/core/net/ipv6/multicast/esmrf.c @@ -46,7 +46,12 @@ #include "net/ipv6/multicast/uip-mcast6-route.h" #include "net/ipv6/multicast/uip-mcast6-stats.h" #include "net/ipv6/multicast/esmrf.h" -#include "rpl.h" +#if UIP_CONF_IPV6_RPL_LITE == 1 +#include "net/rpl-lite/rpl.h" +#else /* UIP_CONF_IPV6_RPL_LITE == 1 */ +#include "net/rpl/rpl.h" +#include "net/rpl/rpl-private.h" +#endif /* UIP_CONF_IPV6_RPL_LITE == 1 */ #include "net/ip/uip.h" #include "net/netstack.h" #include "net/packetbuf.h" diff --git a/core/net/ipv6/multicast/smrf.c b/core/net/ipv6/multicast/smrf.c index 1e1507f37..97364e82a 100644 --- a/core/net/ipv6/multicast/smrf.c +++ b/core/net/ipv6/multicast/smrf.c @@ -47,7 +47,11 @@ #include "net/ipv6/multicast/uip-mcast6-route.h" #include "net/ipv6/multicast/uip-mcast6-stats.h" #include "net/ipv6/multicast/smrf.h" -#include "rpl.h" +#if UIP_CONF_IPV6_RPL_LITE == 1 +#include "net/rpl-lite/rpl.h" +#else /* UIP_CONF_IPV6_RPL_LITE == 1 */ +#include "net/rpl/rpl.h" +#endif /* UIP_CONF_IPV6_RPL_LITE == 1 */ #include "net/netstack.h" #include "net/packetbuf.h" #include diff --git a/core/net/ipv6/uip-ds6-route.h b/core/net/ipv6/uip-ds6-route.h index b2409507e..ac816b465 100644 --- a/core/net/ipv6/uip-ds6-route.h +++ b/core/net/ipv6/uip-ds6-route.h @@ -45,7 +45,11 @@ #include "sys/stimer.h" #include "lib/list.h" #if UIP_CONF_IPV6_RPL -#include "rpl-conf.h" +#if UIP_CONF_IPV6_RPL_LITE == 1 +#include "net/rpl-lite/rpl-conf.h" +#else /* UIP_CONF_IPV6_RPL_LITE == 1 */ +#include "net/rpl/rpl-conf.h" +#endif /* UIP_CONF_IPV6_RPL_LITE == 1 */ #endif #ifdef UIP_CONF_MAX_ROUTES diff --git a/core/net/ipv6/uip-icmp6.c b/core/net/ipv6/uip-icmp6.c index 800a41cf4..fbcf90123 100644 --- a/core/net/ipv6/uip-icmp6.c +++ b/core/net/ipv6/uip-icmp6.c @@ -59,10 +59,12 @@ #define UIP_FIRST_EXT_BUF ((struct uip_ext_hdr *)&uip_buf[UIP_LLIPH_LEN]) #if UIP_CONF_IPV6_RPL -#include "rpl.h" -#if UIP_CONF_IPV6_RPL_LITE == 0 -#include "rpl-private.h" -#endif /* UIP_CONF_IPV6_RPL_LITE == 0 */ +#if UIP_CONF_IPV6_RPL_LITE == 1 +#include "net/rpl-lite/rpl.h" +#else /* UIP_CONF_IPV6_RPL_LITE == 1 */ +#include "net/rpl/rpl.h" +#include "net/rpl/rpl-private.h" +#endif /* UIP_CONF_IPV6_RPL_LITE == 1 */ #endif /* UIP_CONF_IPV6_RPL */ /** \brief temporary IP address */ diff --git a/core/net/ipv6/uip6.c b/core/net/ipv6/uip6.c index 740d2ae48..cbd11352b 100644 --- a/core/net/ipv6/uip6.c +++ b/core/net/ipv6/uip6.c @@ -81,10 +81,12 @@ #include "net/ipv6/multicast/uip-mcast6.h" #if UIP_CONF_IPV6_RPL -#include "rpl.h" -#if UIP_CONF_IPV6_RPL_LITE == 0 -#include "rpl-private.h" -#endif /* UIP_CONF_IPV6_RPL_LITE == 0 */ +#if UIP_CONF_IPV6_RPL_LITE == 1 +#include "net/rpl-lite/rpl.h" +#else /* UIP_CONF_IPV6_RPL_LITE == 1 */ +#include "net/rpl/rpl.h" +#include "net/rpl/rpl-private.h" +#endif /* UIP_CONF_IPV6_RPL_LITE == 1 */ #endif #if UIP_ND6_SEND_NS diff --git a/core/net/mac/tsch/tsch-rpl.c b/core/net/mac/tsch/tsch-rpl.c index 94bad7c45..166763ad8 100644 --- a/core/net/mac/tsch/tsch-rpl.c +++ b/core/net/mac/tsch/tsch-rpl.c @@ -38,10 +38,12 @@ #if UIP_CONF_IPV6_RPL #include "contiki.h" -#include "rpl.h" -#if UIP_CONF_IPV6_RPL_LITE == 0 -#include "rpl-private.h" -#endif /* UIP_CONF_IPV6_RPL_LITE == 0 */ +#if UIP_CONF_IPV6_RPL_LITE == 1 +#include "net/rpl-lite/rpl.h" +#else /* UIP_CONF_IPV6_RPL_LITE == 1 */ +#include "net/rpl/rpl.h" +#include "net/rpl/rpl-private.h" +#endif /* UIP_CONF_IPV6_RPL_LITE == 1 */ #include "net/mac/tsch/tsch.h" #include "net/mac/tsch/tsch-private.h" #include "net/mac/tsch/tsch-schedule.h" diff --git a/core/net/mac/tsch/tsch-rpl.h b/core/net/mac/tsch/tsch-rpl.h index 9f92dc515..180ec2bdd 100644 --- a/core/net/mac/tsch/tsch-rpl.h +++ b/core/net/mac/tsch/tsch-rpl.h @@ -34,7 +34,11 @@ /********** Includes **********/ -#include "rpl.h" +#if UIP_CONF_IPV6_RPL_LITE == 1 +#include "net/rpl-lite/rpl.h" +#else /* UIP_CONF_IPV6_RPL_LITE == 1 */ +#include "net/rpl/rpl.h" +#endif /* UIP_CONF_IPV6_RPL_LITE == 1 */ #include "net/mac/tsch/tsch-queue.h" /********** Functions *********/ diff --git a/core/net/rpl-lite/rpl-dag-root.c b/core/net/rpl-lite/rpl-dag-root.c index a14ace3f9..d18280c70 100644 --- a/core/net/rpl-lite/rpl-dag-root.c +++ b/core/net/rpl-lite/rpl-dag-root.c @@ -32,7 +32,7 @@ #include "contiki.h" #include "contiki-net.h" -#include "rpl.h" +#include "net/rpl-lite/rpl.h" #include "net/ipv6/uip-ds6-route.h" #include diff --git a/core/net/rpl-lite/rpl-dag.c b/core/net/rpl-lite/rpl-dag.c index ddf220e37..3b8135cec 100644 --- a/core/net/rpl-lite/rpl-dag.c +++ b/core/net/rpl-lite/rpl-dag.c @@ -44,7 +44,7 @@ * @{ */ -#include "rpl.h" +#include "net/rpl-lite/rpl.h" #include "net/nbr-table.h" #define DEBUG DEBUG_NONE diff --git a/core/net/rpl-lite/rpl-ext-header.c b/core/net/rpl-lite/rpl-ext-header.c index f7b554f15..a11bb1cdd 100644 --- a/core/net/rpl-lite/rpl-ext-header.c +++ b/core/net/rpl-lite/rpl-ext-header.c @@ -45,7 +45,7 @@ * @{ */ -#include "rpl.h" +#include "net/rpl-lite/rpl.h" #include "net/packetbuf.h" #define DEBUG DEBUG_NONE diff --git a/core/net/rpl-lite/rpl-icmp6.c b/core/net/rpl-lite/rpl-icmp6.c index 0b7a5fc46..a344b2a9f 100644 --- a/core/net/rpl-lite/rpl-icmp6.c +++ b/core/net/rpl-lite/rpl-icmp6.c @@ -46,7 +46,7 @@ * @{ */ -#include "rpl.h" +#include "net/rpl-lite/rpl.h" #include "net/ipv6/uip-icmp6.h" #include "net/packetbuf.h" #include "lib/random.h" diff --git a/core/net/rpl-lite/rpl-mrhof.c b/core/net/rpl-lite/rpl-mrhof.c index 9fe9d05a3..881c93bbe 100644 --- a/core/net/rpl-lite/rpl-mrhof.c +++ b/core/net/rpl-lite/rpl-mrhof.c @@ -47,7 +47,7 @@ * @{ */ -#include "rpl.h" +#include "net/rpl-lite/rpl.h" #include "net/nbr-table.h" #include "net/link-stats.h" diff --git a/core/net/rpl-lite/rpl-nbr-policy.c b/core/net/rpl-lite/rpl-nbr-policy.c index 995f6a99f..711d433b5 100644 --- a/core/net/rpl-lite/rpl-nbr-policy.c +++ b/core/net/rpl-lite/rpl-nbr-policy.c @@ -44,7 +44,7 @@ * */ -#include "rpl.h" +#include "net/rpl-lite/rpl.h" #include "net/nbr-table.h" #define DEBUG DEBUG_NONE diff --git a/core/net/rpl-lite/rpl-neighbor.c b/core/net/rpl-lite/rpl-neighbor.c index 051801880..377ef9df6 100644 --- a/core/net/rpl-lite/rpl-neighbor.c +++ b/core/net/rpl-lite/rpl-neighbor.c @@ -45,7 +45,7 @@ */ #include "contiki.h" -#include "rpl.h" +#include "net/rpl-lite/rpl.h" #include "net/link-stats.h" #include "net/nbr-table.h" diff --git a/core/net/rpl-lite/rpl-neighbor.h b/core/net/rpl-lite/rpl-neighbor.h index f26085aac..a1a32b244 100644 --- a/core/net/rpl-lite/rpl-neighbor.h +++ b/core/net/rpl-lite/rpl-neighbor.h @@ -41,7 +41,7 @@ /********** Includes **********/ -#include "rpl.h" +#include "net/rpl-lite/rpl.h" #include "lib/list.h" #include "net/ip/uip.h" #include "net/ipv6/uip-ds6.h" diff --git a/core/net/rpl-lite/rpl-ns.c b/core/net/rpl-lite/rpl-ns.c index f07312748..7a1387fbe 100644 --- a/core/net/rpl-lite/rpl-ns.c +++ b/core/net/rpl-lite/rpl-ns.c @@ -37,7 +37,7 @@ * \author Simon Duquennoy */ -#include "rpl.h" +#include "net/rpl-lite/rpl.h" #include "lib/list.h" #include "lib/memb.h" diff --git a/core/net/rpl-lite/rpl-ns.h b/core/net/rpl-lite/rpl-ns.h index 2af6f92bf..c09d0f6ad 100644 --- a/core/net/rpl-lite/rpl-ns.h +++ b/core/net/rpl-lite/rpl-ns.h @@ -43,8 +43,8 @@ /********** Includes **********/ -#include "uip.h" -#include "rpl.h" +#include "net/ip/uip.h" +#include "net/rpl-lite/rpl.h" /** * \addtogroup uip6 diff --git a/core/net/rpl-lite/rpl-of0.c b/core/net/rpl-lite/rpl-of0.c index 98cf93183..0fe8dc46e 100644 --- a/core/net/rpl-lite/rpl-of0.c +++ b/core/net/rpl-lite/rpl-of0.c @@ -43,7 +43,7 @@ * @{ */ -#include "rpl.h" +#include "net/rpl-lite/rpl.h" #include "net/nbr-table.h" #include "net/link-stats.h" diff --git a/core/net/rpl-lite/rpl-timers.c b/core/net/rpl-lite/rpl-timers.c index a73958601..93eef918d 100644 --- a/core/net/rpl-lite/rpl-timers.c +++ b/core/net/rpl-lite/rpl-timers.c @@ -43,7 +43,7 @@ */ #include "contiki-conf.h" -#include "rpl.h" +#include "net/rpl-lite/rpl.h" #include "net/link-stats.h" #include "lib/random.h" #include "sys/ctimer.h" diff --git a/core/net/rpl-lite/rpl-timers.h b/core/net/rpl-lite/rpl-timers.h index 447ef7fdb..6fffc807c 100644 --- a/core/net/rpl-lite/rpl-timers.h +++ b/core/net/rpl-lite/rpl-timers.h @@ -41,7 +41,7 @@ /********** Includes **********/ -#include "rpl.h" +#include "net/rpl-lite/rpl.h" /** * \addtogroup uip6 diff --git a/core/net/rpl-lite/rpl.c b/core/net/rpl-lite/rpl.c index 7ceaf12a3..2484a7c4f 100644 --- a/core/net/rpl-lite/rpl.c +++ b/core/net/rpl-lite/rpl.c @@ -43,7 +43,7 @@ * @{ */ -#include "rpl.h" +#include "net/rpl-lite/rpl.h" #define DEBUG DEBUG_NONE #include "net/ip/uip-debug.h" diff --git a/core/net/rpl-lite/rpl.h b/core/net/rpl-lite/rpl.h index 60acaab23..7b9c75621 100644 --- a/core/net/rpl-lite/rpl.h +++ b/core/net/rpl-lite/rpl.h @@ -41,17 +41,17 @@ /********** Includes **********/ -#include "uip.h" -#include "rpl-const.h" -#include "rpl-conf.h" -#include "rpl-types.h" -#include "rpl-icmp6.h" -#include "rpl-dag.h" -#include "rpl-ns.h" -#include "rpl-dag-root.h" -#include "rpl-neighbor.h" -#include "rpl-ext-header.h" -#include "rpl-timers.h" +#include "net/ip/uip.h" +#include "net/rpl-lite/rpl-const.h" +#include "net/rpl-lite/rpl-conf.h" +#include "net/rpl-lite/rpl-types.h" +#include "net/rpl-lite/rpl-icmp6.h" +#include "net/rpl-lite/rpl-dag.h" +#include "net/rpl-lite/rpl-ns.h" +#include "net/rpl-lite/rpl-dag-root.h" +#include "net/rpl-lite/rpl-neighbor.h" +#include "net/rpl-lite/rpl-ext-header.h" +#include "net/rpl-lite/rpl-timers.h" /** * \addtogroup uip6 diff --git a/core/net/rpl/rpl-dag-root.c b/core/net/rpl/rpl-dag-root.c index 88e2069f3..0738a01a7 100644 --- a/core/net/rpl/rpl-dag-root.c +++ b/core/net/rpl/rpl-dag-root.c @@ -32,9 +32,9 @@ #include "contiki.h" #include "contiki-net.h" -#include "rpl.h" -#include "rpl-private.h" -#include "rpl-dag-root.h" +#include "net/rpl/rpl.h" +#include "net/rpl/rpl-private.h" +#include "net/rpl/rpl-dag-root.h" #include "net/ipv6/uip-ds6-route.h" #include diff --git a/core/net/rpl/rpl-dag.c b/core/net/rpl/rpl-dag.c index e74fa2dfc..4df466973 100644 --- a/core/net/rpl/rpl-dag.c +++ b/core/net/rpl/rpl-dag.c @@ -45,7 +45,7 @@ #include "contiki.h" #include "net/link-stats.h" -#include "rpl-private.h" +#include "net/rpl/rpl-private.h" #include "net/ip/uip.h" #include "net/ipv6/uip-nd6.h" #include "net/ipv6/uip-ds6-nbr.h" diff --git a/core/net/rpl/rpl-ext-header.c b/core/net/rpl/rpl-ext-header.c index f50557267..e64d94d24 100644 --- a/core/net/rpl/rpl-ext-header.c +++ b/core/net/rpl/rpl-ext-header.c @@ -47,8 +47,8 @@ #include "net/ip/uip.h" #include "net/ip/tcpip.h" #include "net/ipv6/uip-ds6.h" -#include "rpl-private.h" -#include "rpl-ns.h" +#include "net/rpl/rpl-private.h" +#include "net/rpl/rpl-ns.h" #include "net/packetbuf.h" #define DEBUG DEBUG_NONE diff --git a/core/net/rpl/rpl-icmp6.c b/core/net/rpl/rpl-icmp6.c index a49d03784..e7f58a4bd 100644 --- a/core/net/rpl/rpl-icmp6.c +++ b/core/net/rpl/rpl-icmp6.c @@ -50,8 +50,8 @@ #include "net/ipv6/uip-ds6.h" #include "net/ipv6/uip-nd6.h" #include "net/ipv6/uip-icmp6.h" -#include "rpl-private.h" -#include "rpl-ns.h" +#include "net/rpl/rpl-private.h" +#include "net/rpl/rpl-ns.h" #include "net/packetbuf.h" #include "net/ipv6/multicast/uip-mcast6.h" #include "random.h" diff --git a/core/net/rpl/rpl-mrhof.c b/core/net/rpl/rpl-mrhof.c index 932c8d469..541b101a0 100644 --- a/core/net/rpl/rpl-mrhof.c +++ b/core/net/rpl/rpl-mrhof.c @@ -46,8 +46,8 @@ * @{ */ -#include "rpl.h" -#include "rpl-private.h" +#include "net/rpl/rpl.h" +#include "net/rpl/rpl-private.h" #include "net/nbr-table.h" #include "net/link-stats.h" diff --git a/core/net/rpl/rpl-nbr-policy.c b/core/net/rpl/rpl-nbr-policy.c index cede66bd7..60894ba21 100644 --- a/core/net/rpl/rpl-nbr-policy.c +++ b/core/net/rpl/rpl-nbr-policy.c @@ -44,7 +44,7 @@ * */ -#include "rpl-private.h" +#include "net/rpl/rpl-private.h" #include "net/nbr-table.h" #include "net/ipv6/uip-ds6-nbr.h" #include "net/ipv6/uip-ds6-route.h" diff --git a/core/net/rpl/rpl-ns.c b/core/net/rpl/rpl-ns.c index abf60c198..30ff2da1f 100644 --- a/core/net/rpl/rpl-ns.c +++ b/core/net/rpl/rpl-ns.c @@ -37,14 +37,14 @@ * \author Simon Duquennoy */ -#include "rpl-conf.h" +#include "net/rpl/rpl-conf.h" #include "net/ip/uip.h" #include "net/ip/tcpip.h" #include "net/ipv6/uip-ds6.h" #include "net/ipv6/uip-icmp6.h" -#include "rpl-private.h" -#include "rpl-ns.h" +#include "net/rpl/rpl-private.h" +#include "net/rpl/rpl-ns.h" #include "lib/list.h" #include "lib/memb.h" diff --git a/core/net/rpl/rpl-ns.h b/core/net/rpl/rpl-ns.h index 034fe0060..1ac992831 100644 --- a/core/net/rpl/rpl-ns.h +++ b/core/net/rpl/rpl-ns.h @@ -41,7 +41,7 @@ #ifndef RPL_NS_H #define RPL_NS_H -#include "rpl-conf.h" +#include "net/rpl/rpl-conf.h" #ifdef RPL_NS_CONF_LINK_NUM #define RPL_NS_LINK_NUM RPL_NS_CONF_LINK_NUM diff --git a/core/net/rpl/rpl-of0.c b/core/net/rpl/rpl-of0.c index 8b94abc9b..50190b18f 100644 --- a/core/net/rpl/rpl-of0.c +++ b/core/net/rpl/rpl-of0.c @@ -42,8 +42,8 @@ * @{ */ -#include "rpl.h" -#include "rpl-private.h" +#include "net/rpl/rpl.h" +#include "net/rpl/rpl-private.h" #include "net/nbr-table.h" #include "net/link-stats.h" diff --git a/core/net/rpl/rpl-private.h b/core/net/rpl/rpl-private.h index bc03e32d0..ce4d88db4 100644 --- a/core/net/rpl/rpl-private.h +++ b/core/net/rpl/rpl-private.h @@ -37,7 +37,7 @@ #ifndef RPL_PRIVATE_H #define RPL_PRIVATE_H -#include "rpl.h" +#include "net/rpl/rpl.h" #include "lib/list.h" #include "net/ip/uip.h" @@ -45,7 +45,7 @@ #include "sys/ctimer.h" #include "net/ipv6/uip-ds6.h" #include "net/ipv6/uip-ds6-route.h" -#include "rpl-ns.h" +#include "net/rpl/rpl-ns.h" #include "net/ipv6/multicast/uip-mcast6.h" /*---------------------------------------------------------------------------*/ @@ -252,7 +252,7 @@ struct rpl_dio { }; typedef struct rpl_dio rpl_dio_t; -#if RPL_CONF_STATS +#if RPL_CONF_STATS /* Statistics for fault management. */ struct rpl_stats { uint16_t mem_overflows; diff --git a/core/net/rpl/rpl-timers.c b/core/net/rpl/rpl-timers.c index 951864fa4..09ff1c813 100644 --- a/core/net/rpl/rpl-timers.c +++ b/core/net/rpl/rpl-timers.c @@ -42,8 +42,8 @@ */ #include "contiki-conf.h" -#include "rpl-private.h" -#include "rpl-ns.h" +#include "net/rpl/rpl-private.h" +#include "net/rpl/rpl-ns.h" #include "net/link-stats.h" #include "net/ipv6/multicast/uip-mcast6.h" #include "lib/random.h" diff --git a/core/net/rpl/rpl.c b/core/net/rpl/rpl.c index 1a8a69945..7cddf279b 100644 --- a/core/net/rpl/rpl.c +++ b/core/net/rpl/rpl.c @@ -46,8 +46,8 @@ #include "net/ip/tcpip.h" #include "net/ipv6/uip-ds6.h" #include "net/ipv6/uip-icmp6.h" -#include "rpl-private.h" -#include "rpl-ns.h" +#include "net/rpl/rpl-private.h" +#include "net/rpl/rpl-ns.h" #include "net/ipv6/multicast/uip-mcast6.h" #define DEBUG DEBUG_NONE diff --git a/core/net/rpl/rpl.h b/core/net/rpl/rpl.h index b39a3f728..61a8636b8 100644 --- a/core/net/rpl/rpl.h +++ b/core/net/rpl/rpl.h @@ -38,7 +38,7 @@ #ifndef RPL_H #define RPL_H -#include "rpl-conf.h" +#include "net/rpl/rpl-conf.h" #include "lib/list.h" #include "net/ip/uip.h"