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

Removed the force flag from rpl_reset_dio_timer. Removed an unnecessary DIO timer reset when changing rank but keeping the same preferred parent.

Browse source
This commit is contained in:
Nicolas Tsiftes 2012-01-04 11:22:11 +01:00
parent 3f31fb9514
commit f112fa99d5
4 changed files with 66 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -153,7 +153,7 @@ handle_dio_timer(void *ptr)
instance->dio_counter, instance->dio_redundancy);
}
instance->dio_send = 0;
PRINTF("RPL: Scheduling DIO timer %"PRIu32" ticks in future (sent)\n",
PRINTF("RPL: Scheduling DIO timer %lu ticks in future (sent)\n",
instance->dio_next_delay);
ctimer_set(&instance->dio_timer, instance->dio_next_delay, handle_dio_timer, instance);
} else {
@ -175,12 +175,12 @@ rpl_reset_periodic_timer(void)
/************************************************************************/
/* Resets the DIO timer in the instance to its minimal interval. */
void
rpl_reset_dio_timer(rpl_instance_t *instance, uint8_t force)
rpl_reset_dio_timer(rpl_instance_t *instance)
{
#if !RPL_LEAF_ONLY
/* Do not reset if we are already on the minimum interval,
unless forced to do so. */
if(force || instance->dio_intcurrent > instance->dio_intmin) {
if(instance->dio_intcurrent > instance->dio_intmin) {
instance->dio_counter = 0;
instance->dio_intcurrent = instance->dio_intmin;
new_dio_interval(instance);