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

Changed the name of macros defined in neighbor-info.h to have the NEIGHBOR_INFO prefix.

Browse source
This commit is contained in:
Adam Dunkels 2011-02-13 21:29:59 +01:00
parent acb5480aa9
commit 432928d000
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/net/rpl/rpl-of0.c
View file

@ -60,7 +60,7 @@ rpl_of_t rpl_of0 = {
#define DEFAULT_RANK_INCREMENT DEFAULT_MIN_HOPRANKINC #define DEFAULT_RANK_INCREMENT DEFAULT_MIN_HOPRANKINC
#define MIN_DIFFERENCE (ETX_DIVISOR + ETX_DIVISOR / 2) #define MIN_DIFFERENCE (NEIGHBOR_INFO_ETX_DIVISOR + NEIGHBOR_INFO_ETX_DIVISOR / 2)
static void static void
reset(rpl_dag_t *dag) reset(rpl_dag_t *dag)
@ -105,8 +105,10 @@ best_parent(rpl_parent_t *p1, rpl_parent_t *p2)
p2->etx, p2->rank); p2->etx, p2->rank);
r1 = DAG_RANK(p1->rank, (rpl_dag_t *)p1->dag) * ETX_DIVISOR + p1->etx; r1 = DAG_RANK(p1->rank, (rpl_dag_t *)p1->dag) * NEIGHBOR_INFO_ETX_DIVISOR +
r2 = DAG_RANK(p2->rank, (rpl_dag_t *)p1->dag) * ETX_DIVISOR + p2->etx; p1->etx;
r2 = DAG_RANK(p2->rank, (rpl_dag_t *)p1->dag) * NEIGHBOR_INFO_ETX_DIVISOR +
p2->etx;
/* Compare two parents by looking both and their rank and at the ETX /* Compare two parents by looking both and their rank and at the ETX
for that parent. We choose the parent that has the most for that parent. We choose the parent that has the most
favourable combination. */ favourable combination. */