riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5267 from cgundogan/pr/gnrc_rpl/reduce_scope_now

Browse Source 
gnrc_rpl: reduce scope of now
This commit is contained in:
Martine Lenders 2016-04-22 18:23:37 +02:00
commit b8787b64c4
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/net/gnrc/routing/rpl/gnrc_rpl_dodag.c
View File

@ -264,11 +264,10 @@ void gnrc_rpl_local_repair(gnrc_rpl_dodag_t *dodag)
void gnrc_rpl_parent_update(gnrc_rpl_dodag_t *dodag, gnrc_rpl_parent_t *parent)
{
uint32_t now = xtimer_now();
/* update Parent lifetime */
if (parent != NULL) {
parent->lifetime = (now / SEC_IN_USEC) + ((dodag->default_lifetime * dodag->lifetime_unit));
uint32_t now = xtimer_now();
parent->lifetime = (now / SEC_IN_USEC) + (dodag->default_lifetime * dodag->lifetime_unit);
#ifdef MODULE_GNRC_RPL_P2P
if (dodag->instance->mop != GNRC_RPL_P2P_MOP) {
#endif