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

Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki

Browse source
This commit is contained in:
Matthias Kovatsch 2012-03-07 22:24:02 +01:00
parent dd967e62f5 f38962a3c4
commit 7eac4393c2
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/net/uip-ds6.c
View file

@ -224,8 +224,10 @@ uip_ds6_periodic(void)
if(locnbr->nscount >= UIP_ND6_MAX_UNICAST_SOLICIT) { if(locnbr->nscount >= UIP_ND6_MAX_UNICAST_SOLICIT) {
PRINTF("PROBE END\n"); PRINTF("PROBE END\n");
if((locdefrt = uip_ds6_defrt_lookup(&locnbr->ipaddr)) != NULL) { if((locdefrt = uip_ds6_defrt_lookup(&locnbr->ipaddr)) != NULL) {
if (!locdefrt->isinfinite) {
uip_ds6_defrt_rm(locdefrt); uip_ds6_defrt_rm(locdefrt);
} }
}
uip_ds6_nbr_rm(locnbr); uip_ds6_nbr_rm(locnbr);
} else if(stimer_expired(&locnbr->sendns) && (uip_len == 0)) { } else if(stimer_expired(&locnbr->sendns) && (uip_len == 0)) {
locnbr->nscount++; locnbr->nscount++;