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:21:14 +01:00
parent ed3995960d
commit acb5480aa9
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -94,7 +94,7 @@ static rpl_of_t * const objective_functions[] = {&RPL_OF};
#define RPL_DIO_INTERVAL_DOUBLINGS RPL_CONF_DIO_INTERVAL_DOUBLINGS #define RPL_DIO_INTERVAL_DOUBLINGS RPL_CONF_DIO_INTERVAL_DOUBLINGS
#endif /* !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. */ /* Allocate parents from the same static MEMB chunk to reduce memory waste. */

4
core/net/rpl/rpl-of-etx.c
View file

@ -112,9 +112,9 @@ calculate_rank(rpl_parent_t *p, rpl_rank_t base_rank)
rank_increase = INITIAL_LINK_METRIC * DEFAULT_MIN_HOPRANKINC; rank_increase = INITIAL_LINK_METRIC * DEFAULT_MIN_HOPRANKINC;
} else { } else {
if(p->etx == 0) { 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) { if(base_rank == 0) {
base_rank = p->rank; base_rank = p->rank;
} }