Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / lib / net / 4bitle / LinkEstimator.h

diff --git a/tos/lib/net/4bitle/LinkEstimator.h b/tos/lib/net/4bitle/LinkEstimator.h
index 5969e662bcd395d6e33fe29636eaf861bc3ba7ac..e1da6a25af43e536dd4f561f67ab420f9d8d4720 100644 (file)
--- a/tos/lib/net/4bitle/LinkEstimator.h
+++ b/tos/lib/net/4bitle/LinkEstimator.h
@@ -95,15 +95,12 @@ typedef struct neighbor_table_entry {
   uint8_t failcnt;
   // flags to describe the state of this entry
   uint8_t flags;
-  // MAXAGE-inage gives the number of update rounds we haven't been able
-  // update the inbound beacon estimator
-  uint8_t inage;
   // inbound qualities in the range [1..255]
   // 1 bad, 255 good
   uint8_t inquality;
-  // EETX for the link to this neighbor. This is the quality returned to
+  // ETX for the link to this neighbor. This is the quality returned to
   // the users of the link estimator
-  uint16_t eetx;
+  uint16_t etx;
   // Number of data packets successfully sent (ack'd) to this neighbor
   // since the last data estimator update round. This update happens
   // every DLQ_PKT_WINDOW data packets