Skip to content

Commit 60853df

Browse files
elenaf9crasbe
andauthored
fixup! gnrc/rpl: float DODAG during local repair
Apply suggestions from code review. Co-authored-by: crasbe <[email protected]>
1 parent 7261632 commit 60853df

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

sys/include/net/gnrc/rpl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@ extern netstats_rpl_t gnrc_rpl_netstats;
631631
* @brief Timeout for floating DODAGs in milliseconds.
632632
*/
633633
#ifndef CONFIG_GNRC_RPL_DODAG_FLOAT_TIMEOUT
634-
#define CONFIG_GNRC_RPL_DODAG_FLOAT_TIMEOUT (15 * MS_PER_SEC * SEC_PER_MIN)
634+
# define CONFIG_GNRC_RPL_DODAG_FLOAT_TIMEOUT (15 * MS_PER_SEC * SEC_PER_MIN)
635635
#endif
636636

637637
/**

sys/include/net/gnrc/rpl/structs.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -330,8 +330,10 @@ struct gnrc_rpl_dodag {
330330
uint8_t dio_opts; /**< options in the next DIO
331331
(see @ref GNRC_RPL_REQ_DIO_OPTS "DIO Options") */
332332
evtimer_msg_event_t dao_event; /**< DAO TX events (see @ref GNRC_RPL_MSG_TYPE_DODAG_DAO_TX) */
333-
evtimer_msg_event_t float_timeout_event; /**< floating dodag timeout events
334-
(see @ref GNRC_RPL_MSG_TYPE_DODAG_FLOAT_TIMEOUT) */
333+
/**
334+
* floating dodag timeout events (see @ref GNRC_RPL_MSG_TYPE_DODAG_FLOAT_TIMEOUT)
335+
*/
336+
evtimer_msg_event_t float_timeout_event;
335337
trickle_t trickle; /**< trickle representation */
336338
};
337339

sys/net/gnrc/routing/rpl/gnrc_rpl_dodag.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,6 @@ void gnrc_rpl_local_repair(gnrc_rpl_dodag_t *dodag)
341341

342342
dodag->dtsn++;
343343

344-
345344
if ((CONFIG_GNRC_RPL_DODAG_FLOAT_TIMEOUT <= 0) || !_float_dodag(dodag)) {
346345
gnrc_rpl_poison_routes(dodag);
347346
}

0 commit comments

Comments
 (0)