From 26f0a6e88efd401ed43000b52fdf43d9bd8782dc Mon Sep 17 00:00:00 2001 From: Joakim Eriksson Date: Mon, 28 Mar 2011 16:17:53 +0200 Subject: [PATCH] changed ext to link_metric --- core/net/rpl/rpl-of0.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/net/rpl/rpl-of0.c b/core/net/rpl/rpl-of0.c index b41f78791..b9ea90a83 100644 --- a/core/net/rpl/rpl-of0.c +++ b/core/net/rpl/rpl-of0.c @@ -101,16 +101,16 @@ best_parent(rpl_parent_t *p1, rpl_parent_t *p2) PRINTF("RPL: Comparing parent "); PRINT6ADDR(&p1->addr); PRINTF(" (confidence %d, rank %d) with parent ", - p1->etx, p1->rank); + p1->link_metric, p1->rank); PRINT6ADDR(&p2->addr); PRINTF(" (confidence %d, rank %d)\n", - p2->etx, p2->rank); + p2->link_metric, p2->rank); r1 = DAG_RANK(p1->rank, (rpl_dag_t *)p1->dag) * NEIGHBOR_INFO_ETX_DIVISOR + - p1->etx; + p1->link_metric; r2 = DAG_RANK(p2->rank, (rpl_dag_t *)p1->dag) * NEIGHBOR_INFO_ETX_DIVISOR + - p2->etx; + p2->link_metric; /* Compare two parents by looking both and their rank and at the ETX for that parent. We choose the parent that has the most favourable combination. */