diff --git a/core/net/rpl/rpl-dag.c b/core/net/rpl/rpl-dag.c index 33961e8c1..003432852 100644 --- a/core/net/rpl/rpl-dag.c +++ b/core/net/rpl/rpl-dag.c @@ -83,7 +83,8 @@ rpl_instance_t *default_instance; /*---------------------------------------------------------------------------*/ uip_ds6_nbr_t * -rpl_get_nbr(rpl_parent_t *parent) { +rpl_get_nbr(rpl_parent_t *parent) +{ linkaddr_t *lladdr = NULL; lladdr = nbr_table_get_lladdr(rpl_parents, parent); if(lladdr != NULL) { @@ -93,9 +94,7 @@ rpl_get_nbr(rpl_parent_t *parent) { return NULL; } } - /*---------------------------------------------------------------------------*/ - static void nbr_callback(void *ptr) { diff --git a/core/net/rpl/rpl-mrhof.c b/core/net/rpl/rpl-mrhof.c index 4437e5e30..9a4b76333 100644 --- a/core/net/rpl/rpl-mrhof.c +++ b/core/net/rpl/rpl-mrhof.c @@ -127,9 +127,10 @@ neighbor_link_callback(rpl_parent_t *p, int status, int numtx) nbr = rpl_get_nbr(p); if(nbr == NULL) { - /* No neighbor for this parent - something bad has occured!??? */ + /* No neighbor for this parent - something bad has occured */ return; } + recorded_etx = nbr->link_metric; /* Do not penalize the ETX when collisions or transmission errors occur. */