From 54b55e96c4eeca71d7eca48b4098a6a6a087b5a9 Mon Sep 17 00:00:00 2001 From: George Oikonomou Date: Thu, 20 Feb 2014 15:48:21 +0000 Subject: [PATCH] Check Tactive irrespective of suppression --- core/net/ipv6/multicast/roll-tm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/net/ipv6/multicast/roll-tm.c b/core/net/ipv6/multicast/roll-tm.c index e8aa863c0..d41b065d2 100644 --- a/core/net/ipv6/multicast/roll-tm.c +++ b/core/net/ipv6/multicast/roll-tm.c @@ -618,9 +618,9 @@ handle_timer(void *ptr) MCAST_PACKET_FREE(locmpptr); } else if(MCAST_PACKET_TTL(locmpptr) > 0) { /* Handle multicast transmissions */ - if((SUPPRESSION_ENABLED(param) && MCAST_PACKET_MUST_SEND(locmpptr)) || - (SUPPRESSION_DISABLED(param) && - locmpptr->active < TRICKLE_ACTIVE(param))) { + if(locmpptr->active < TRICKLE_ACTIVE(param) && + ((SUPPRESSION_ENABLED(param) && MCAST_PACKET_MUST_SEND(locmpptr)) || + SUPPRESSION_DISABLED(param))) { PRINTF("ROLL TM: M=%u Periodic - Sending packet from Seed ", m); PRINT_SEED(&locmpptr->sw->seed_id); PRINTF(" seq %u\n", locmpptr->seq_val);