mirror of
https://github.com/oliverschmidt/contiki.git
synced 2024-09-10 14:54:46 +00:00
changed etx to metric
This commit is contained in:
parent
236c459ecf
commit
5a4a39afb3
@ -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 */
|
||||||
|
@ -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;
|
||||||
|
Loading…
Reference in New Issue
Block a user