From 5a4a39afb3b33f3664c27c806ba2e581a0e8516d Mon Sep 17 00:00:00 2001 From: Niclas Finne Date: Thu, 7 Apr 2011 09:46:37 +0200 Subject: [PATCH] changed etx to metric --- core/net/neighbor-info.h | 6 +++--- examples/ipv6/rpl-collect/udp-sender.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/net/neighbor-info.h b/core/net/neighbor-info.h index f292c2ef1..0332142f3 100644 --- a/core/net/neighbor-info.h +++ b/core/net/neighbor-info.h @@ -82,10 +82,10 @@ int neighbor_info_subscribe(neighbor_info_subscriber_t); /** - * Get link ETX value for a specific neighbor. + * Get link metric value for a specific neighbor. * - * \return Returns ETX if the neighbor exists, and 0 if not. + * \return Returns link metric if the neighbor exists, and 0 if not. */ -link_metric_t neighbor_info_get_etx(const rimeaddr_t *addr); +link_metric_t neighbor_info_get_metric(const rimeaddr_t *addr); #endif /* NEIGHBOR_INFO_H */ diff --git a/examples/ipv6/rpl-collect/udp-sender.c b/examples/ipv6/rpl-collect/udp-sender.c index 430e55e29..6652f5f0b 100644 --- a/examples/ipv6/rpl-collect/udp-sender.c +++ b/examples/ipv6/rpl-collect/udp-sender.c @@ -136,7 +136,7 @@ collect_common_send(void) nbr = uip_ds6_nbr_lookup(&preferred_parent->addr); if(nbr != NULL) { rimeaddr_copy(&parent, (rimeaddr_t *)&nbr->ipaddr.u8[8]); - parent_etx = neighbor_info_get_etx((rimeaddr_t *) &nbr->lladdr) / 2; + parent_etx = neighbor_info_get_metric((rimeaddr_t *) &nbr->lladdr) / 2; } } rtmetric = dag->rank;