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

Merge pull request #299 from jdede/rpl-rm-neighbor

Browse source 
Default route not removed
This commit is contained in:
Adam Dunkels 2013-07-26 03:52:55 -07:00
parent 4108066f0a 2f1bf730af
commit 9ba5d9694c
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/net/rpl/rpl-dag.c
View file

@ -703,7 +703,9 @@ rpl_remove_parent(rpl_dag_t *dag, rpl_parent_t *parent)
void void
rpl_nullify_parent(rpl_dag_t *dag, rpl_parent_t *parent) rpl_nullify_parent(rpl_dag_t *dag, rpl_parent_t *parent)
{ {
if(parent == dag->preferred_parent) { /* This function can be called when the preferred parent is NULL, so we
need to handle this condition in order to trigger uip_ds6_defrt_rm. */
if(parent == dag->preferred_parent || dag->preferred_parent == NULL) {
dag->preferred_parent = NULL; dag->preferred_parent = NULL;
dag->rank = INFINITE_RANK; dag->rank = INFINITE_RANK;
if(dag->joined) { if(dag->joined) {