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

Check Tactive irrespective of suppression

Browse source
This commit is contained in:
George Oikonomou 2014-02-20 15:48:21 +00:00
parent 9f4cdab1fb
commit 54b55e96c4
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/net/ipv6/multicast/roll-tm.c
View file

@ -618,9 +618,9 @@ handle_timer(void *ptr)
MCAST_PACKET_FREE(locmpptr); MCAST_PACKET_FREE(locmpptr);
} else if(MCAST_PACKET_TTL(locmpptr) > 0) { } else if(MCAST_PACKET_TTL(locmpptr) > 0) {
/* Handle multicast transmissions */ /* Handle multicast transmissions */
if((SUPPRESSION_ENABLED(param) && MCAST_PACKET_MUST_SEND(locmpptr)) || if(locmpptr->active < TRICKLE_ACTIVE(param) &&
(SUPPRESSION_DISABLED(param) && ((SUPPRESSION_ENABLED(param) && MCAST_PACKET_MUST_SEND(locmpptr)) ||
locmpptr->active < TRICKLE_ACTIVE(param))) { SUPPRESSION_DISABLED(param))) {
PRINTF("ROLL TM: M=%u Periodic - Sending packet from Seed ", m); PRINTF("ROLL TM: M=%u Periodic - Sending packet from Seed ", m);
PRINT_SEED(&locmpptr->sw->seed_id); PRINT_SEED(&locmpptr->sw->seed_id);
PRINTF(" seq %u\n", locmpptr->seq_val); PRINTF(" seq %u\n", locmpptr->seq_val);