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

no callback to rpl if rpl is not used

Browse source
This commit is contained in:
joxe 2010-09-21 13:13:09 +00:00
parent 75e4e80df2
commit f1d19a5f9a
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -223,7 +223,6 @@ typedef struct uip_ds6_maddr {
/** \brief define some additional RPL related route state and /** \brief define some additional RPL related route state and
* neighbor callback for RPL - if not a DS6_ROUTE_STATE is already set */ * neighbor callback for RPL - if not a DS6_ROUTE_STATE is already set */
/* #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 */
@ -234,10 +233,13 @@ typedef struct rpl_route_entry {
uint8_t learned_from; uint8_t learned_from;
} rpl_route_entry_t; } rpl_route_entry_t;
#endif /* UIP_DS6_ROUTE_STATE_TYPE */ #endif /* UIP_DS6_ROUTE_STATE_TYPE */
/* only define the callback if RPL is active */
#if UIP_CONF_IPV6_RPL
#ifndef UIP_CONF_DS6_NEIGHBOR_STATE_CHANGED #ifndef UIP_CONF_DS6_NEIGHBOR_STATE_CHANGED
#define UIP_CONF_DS6_NEIGHBOR_STATE_CHANGED rpl_ipv6_neighbor_callback #define UIP_CONF_DS6_NEIGHBOR_STATE_CHANGED rpl_ipv6_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 *\