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

Moved ctimer.[ch] from their old and illogical location in core/net/rime to a more appropriate place in core/sys

Browse source
This commit is contained in:
adamdunkels 2010-06-14 11:33:58 +00:00
parent 97708d6235
commit a890cd3d49
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/net/rpl/rpl-dag.c
View file

@ -32,7 +32,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: rpl-dag.c,v 1.25 2010/06/08 21:37:22 nvt-se Exp $
* $Id: rpl-dag.c,v 1.26 2010/06/14 11:35:21 adamdunkels Exp $
*/
/**
* \file
@ -45,7 +45,7 @@
#include "net/uip.h"
#include "net/uip-nd6.h"
#include "net/rime/ctimer.h"
#include "sys/ctimer.h"
#include "lib/list.h"
#include "lib/memb.h"
@ -127,6 +127,7 @@ remove_parents(rpl_dag_t *dag, rpl_parent_t *exception, int poison_routes)
static int
should_send_dao(rpl_dag_t *dag, rpl_dio_t *dio, rpl_parent_t *p)
{
return 1;
return dio->dst_adv_supported && dio->dst_adv_trigger &&
dio->dtsn > p->dtsn && p == dag->best_parent;
}

4
core/net/rpl/rpl-timers.c
View file

@ -32,7 +32,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: rpl-timers.c,v 1.8 2010/06/02 16:55:00 joxe Exp $
* $Id: rpl-timers.c,v 1.9 2010/06/14 11:35:21 adamdunkels Exp $
*/
/**
* \file
@ -42,7 +42,7 @@
*/
#include "contiki-conf.h"
#include "net/rime/ctimer.h"
#include "sys/ctimer.h"
#include "net/rpl/rpl.h"
#include "lib/random.h"

4
core/net/rpl/rpl.h
View file

@ -30,7 +30,7 @@
*
* Author: Joakim Eriksson, Nicolas Tsiftes
*
* $Id: rpl.h,v 1.17 2010/06/12 10:55:46 joxe Exp $
* $Id: rpl.h,v 1.18 2010/06/14 11:33:58 adamdunkels Exp $
*/
#ifndef RPL_H
@ -49,7 +49,7 @@
#include "lib/list.h"
#include "net/uip.h"
#include "sys/clock.h"
#include "net/rime/ctimer.h"
#include "sys/ctimer.h"
#include "net/uip-ds6.h"
/* set to 1 for some statistics on trickle / DIO */