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

Merge pull request #1720 from joakimeriksson/rpl_ns_periodic

Browse source 
Fix for compilation with clang - issue reported by Olaf Bergmann
This commit is contained in:
Simon Duquennoy 2016-06-15 10:27:58 +02:00 committed by GitHub
parent fa88122140 7853a7434b
commit 872146def0
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/net/rpl/rpl-timers.c
View file

@ -84,12 +84,14 @@ handle_periodic_timer(void *ptr)
rpl_dag_t *dag = rpl_get_any_dag(); rpl_dag_t *dag = rpl_get_any_dag();
rpl_purge_dags(); rpl_purge_dags();
if(dag != NULL && RPL_IS_STORING(dag->instance)) { if(dag != NULL) {
if(RPL_IS_STORING(dag->instance)) {
rpl_purge_routes(); rpl_purge_routes();
} }
if(dag != NULL && RPL_IS_NON_STORING(dag->instance)) { if(RPL_IS_NON_STORING(dag->instance)) {
rpl_ns_periodic(); rpl_ns_periodic();
} }
}
rpl_recalculate_ranks(); rpl_recalculate_ranks();
/* handle DIS */ /* handle DIS */