deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

changed etx to metric

Browse source
This commit is contained in:
Niclas Finne 2011-04-07 09:46:37 +02:00
parent 236c459ecf
commit 5a4a39afb3
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/net/neighbor-info.h
View file

@ -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 */ #endif /* NEIGHBOR_INFO_H */

2
examples/ipv6/rpl-collect/udp-sender.c
View file

@ -136,7 +136,7 @@ collect_common_send(void)
nbr = uip_ds6_nbr_lookup(&preferred_parent->addr); nbr = uip_ds6_nbr_lookup(&preferred_parent->addr);
if(nbr != NULL) { if(nbr != NULL) {
rimeaddr_copy(&parent, (rimeaddr_t *)&nbr->ipaddr.u8[8]); 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; rtmetric = dag->rank;