Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2024-12-22 10:30:13 +00:00
Code Issues Projects Releases Wiki Activity

Avoid hysteresis check if neither p1 nor p2 is the preferred parent.

Browse Source
This commit is contained in:
nvt 2011-03-04 16:40:40 +01:00
parent dd7cec737d
commit a7addf990f
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/net/rpl/rpl-of-etx.c
View File

@ -153,13 +153,15 @@ best_parent(rpl_parent_t *p1, rpl_parent_t *p2)
p2_etx = calculate_etx(p2);
/* Maintain stability of the preferred parent in case of similar ranks. */
if(p1_etx < p2_etx + min_diff &&
p1_etx > p2_etx - min_diff) {
PRINTF("RPL: MRHOF hysteresis: %u <= %u <= %u\n",
p2_etx - min_diff,
p1_etx,
p2_etx + min_diff);
return dag->preferred_parent;
if(p1 == dag->preferred_parent || p2 == dag->preferred_parent) {
if(p1_etx < p2_etx + min_diff &&
p1_etx > p2_etx - min_diff) {
PRINTF("RPL: MRHOF hysteresis: %u <= %u <= %u\n",
p2_etx - min_diff,
p1_etx,
p2_etx + min_diff);
return dag->preferred_parent;
}
}
return p1_etx < p2_etx ? p1 : p2;