deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

always include the RPL route state to allow compilation of rpl code

Browse source
This commit is contained in:
joxe 2010-05-03 14:12:03 +00:00
parent 7cebc4ed99
commit 7d235841b3
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/net/uip-ds6.h
View file

@ -221,8 +221,8 @@ typedef struct uip_ds6_maddr {
} uip_ds6_maddr_t; } uip_ds6_maddr_t;
/** \brief define some additional RPL related route state and /** \brief define some additional RPL related route state and
* neighbor callback for RPL if RPL is defined */ * neighbor callback for RPL - if not a DS6_ROUTE_STATE is already set */
#if UIP_CONF_IPV6_RPL /* #if UIP_CONF_IPV6_RPL */
#ifndef UIP_DS6_ROUTE_STATE_TYPE #ifndef UIP_DS6_ROUTE_STATE_TYPE
#define UIP_DS6_ROUTE_STATE_TYPE rpl_route_entry_t #define UIP_DS6_ROUTE_STATE_TYPE rpl_route_entry_t
/* Needed for the extended route entry state when using ContikiRPL */ /* Needed for the extended route entry state when using ContikiRPL */
@ -236,7 +236,7 @@ typedef struct rpl_route_entry {
#ifndef UIP_CONF_DS6_NEIGHBOR_STATE_CHANGED #ifndef UIP_CONF_DS6_NEIGHBOR_STATE_CHANGED
#define UIP_CONF_DS6_NEIGHBOR_STATE_CHANGED rpl_ds6_neighbor_callback #define UIP_CONF_DS6_NEIGHBOR_STATE_CHANGED rpl_ds6_neighbor_callback
#endif /* UIP_CONF_DS6_NEIGHBOR_STATE_CHANGED */ #endif /* UIP_CONF_DS6_NEIGHBOR_STATE_CHANGED */
#endif /* UIP_CONF_IPV6_RPL */ /* #endif /\* UIP_CONF_IPV6_RPL *\/ */