From 4c5b70e628e697df06e6e0e19a9ef7824027c895 Mon Sep 17 00:00:00 2001 From: Afonso Oliveira Date: Mon, 5 Sep 2016 14:49:41 +0100 Subject: [PATCH 1/2] fix misplaced bracket causing compilation error when probing is deactivated (RPL_WITH_PROBING=0) --- core/net/rpl/rpl-dag.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/net/rpl/rpl-dag.c b/core/net/rpl/rpl-dag.c index de5932692..a154defea 100644 --- a/core/net/rpl/rpl-dag.c +++ b/core/net/rpl/rpl-dag.c @@ -917,11 +917,11 @@ rpl_select_parent(rpl_dag_t *dag) /* Probe the best parent shortly in order to get a fresh estimate */ dag->instance->urgent_probing_target = best; rpl_schedule_probing(dag->instance); + } #else /* RPL_WITH_PROBING */ rpl_set_preferred_parent(dag, best); dag->rank = rpl_rank_via_parent(dag->preferred_parent); #endif /* RPL_WITH_PROBING */ - } } else { rpl_set_preferred_parent(dag, NULL); } From 0217776d6eb1fcc438177d0269e02acf23df57ac Mon Sep 17 00:00:00 2001 From: Afonso Oliveira Date: Mon, 5 Sep 2016 16:24:55 +0100 Subject: [PATCH 2/2] fixed identantion on code below alteration --- core/net/rpl/rpl-dag.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/net/rpl/rpl-dag.c b/core/net/rpl/rpl-dag.c index a154defea..97a309bc8 100644 --- a/core/net/rpl/rpl-dag.c +++ b/core/net/rpl/rpl-dag.c @@ -919,8 +919,8 @@ rpl_select_parent(rpl_dag_t *dag) rpl_schedule_probing(dag->instance); } #else /* RPL_WITH_PROBING */ - rpl_set_preferred_parent(dag, best); - dag->rank = rpl_rank_via_parent(dag->preferred_parent); + rpl_set_preferred_parent(dag, best); + dag->rank = rpl_rank_via_parent(dag->preferred_parent); #endif /* RPL_WITH_PROBING */ } else { rpl_set_preferred_parent(dag, NULL);