Merge branch 'develop' of https://github.com/contiki-ng/contiki-ng into develop
This commit is contained in:
commit
65f34ad893
@ -270,9 +270,11 @@ rpl_link_callback(const linkaddr_t *addr, int status, int numtx)
|
|||||||
if(parent != NULL) {
|
if(parent != NULL) {
|
||||||
/* If this is the neighbor we were probing urgently, mark urgent
|
/* If this is the neighbor we were probing urgently, mark urgent
|
||||||
probing as done */
|
probing as done */
|
||||||
|
#if RPL_WITH_PROBING
|
||||||
if(instance->urgent_probing_target == parent) {
|
if(instance->urgent_probing_target == parent) {
|
||||||
instance->urgent_probing_target = NULL;
|
instance->urgent_probing_target = NULL;
|
||||||
}
|
}
|
||||||
|
#endif /* RPL_WITH_PROBING */
|
||||||
/* Trigger DAG rank recalculation. */
|
/* Trigger DAG rank recalculation. */
|
||||||
LOG_DBG("rpl_link_callback triggering update\n");
|
LOG_DBG("rpl_link_callback triggering update\n");
|
||||||
parent->flags |= RPL_PARENT_FLAG_UPDATED;
|
parent->flags |= RPL_PARENT_FLAG_UPDATED;
|
||||||
|
Loading…
Reference in New Issue
Block a user