From acb5480aa9422079590f32c6b7472d98cf80e14e Mon Sep 17 00:00:00 2001 From: Adam Dunkels Date: Sun, 13 Feb 2011 21:21:14 +0100 Subject: [PATCH] Changed the name of macros defined in neighbor-info.h to have the NEIGHBOR_INFO prefix. --- core/net/rpl/rpl-dag.c | 2 +- core/net/rpl/rpl-of-etx.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/net/rpl/rpl-dag.c b/core/net/rpl/rpl-dag.c index b62fb2a3c..295e3919d 100644 --- a/core/net/rpl/rpl-dag.c +++ b/core/net/rpl/rpl-dag.c @@ -94,7 +94,7 @@ static rpl_of_t * const objective_functions[] = {&RPL_OF}; #define RPL_DIO_INTERVAL_DOUBLINGS RPL_CONF_DIO_INTERVAL_DOUBLINGS #endif /* !RPL_CONF_DIO_INTERVAL_DOUBLINGS */ -#define INITIAL_ETX ETX_DIVISOR * 5 +#define INITIAL_ETX NEIGHBOR_INFO_ETX_DIVISOR * 5 /************************************************************************/ /* Allocate parents from the same static MEMB chunk to reduce memory waste. */ diff --git a/core/net/rpl/rpl-of-etx.c b/core/net/rpl/rpl-of-etx.c index 82e7a2bde..a732cf662 100644 --- a/core/net/rpl/rpl-of-etx.c +++ b/core/net/rpl/rpl-of-etx.c @@ -112,9 +112,9 @@ calculate_rank(rpl_parent_t *p, rpl_rank_t base_rank) rank_increase = INITIAL_LINK_METRIC * DEFAULT_MIN_HOPRANKINC; } else { if(p->etx == 0) { - p->etx = INITIAL_LINK_METRIC * ETX_DIVISOR; + p->etx = INITIAL_LINK_METRIC * NEIGHBOR_INFO_ETX_DIVISOR; } - rank_increase = (p->etx * p->dag->min_hoprankinc) / ETX_DIVISOR; + rank_increase = (p->etx * p->dag->min_hoprankinc) / NEIGHBOR_INFO_ETX_DIVISOR; if(base_rank == 0) { base_rank = p->rank; }