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

Merge branch 'contiki' into osd

Browse source
This commit is contained in:
Harald Pichler 2015-01-13 13:14:11 +01:00
parent 2b8aeee115 7841eface3
commit 007cf1dbe3
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/net/rpl/rpl-icmp6.c
View file

@ -778,6 +778,7 @@ dao_input(void)
rep->state.lifetime = RPL_LIFETIME(instance, lifetime); rep->state.lifetime = RPL_LIFETIME(instance, lifetime);
rep->state.learned_from = learned_from; rep->state.learned_from = learned_from;
rep->state.nopath_received = 0;
#if RPL_CONF_MULTICAST #if RPL_CONF_MULTICAST
fwd_dao: fwd_dao:

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

@ -145,7 +145,7 @@ handle_dio_timer(void *ptr)
if(instance->dio_send) { if(instance->dio_send) {
/* send DIO if counter is less than desired redundancy */ /* send DIO if counter is less than desired redundancy */
if(instance->dio_counter < instance->dio_redundancy) { if(instance->dio_redundancy != 0 && instance->dio_counter < instance->dio_redundancy) {
#if RPL_CONF_STATS #if RPL_CONF_STATS
instance->dio_totsend++; instance->dio_totsend++;
#endif /* RPL_CONF_STATS */ #endif /* RPL_CONF_STATS */