Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / lib / net / le / LinkEstimatorP.nc

diff --git a/tos/lib/net/le/LinkEstimatorP.nc b/tos/lib/net/le/LinkEstimatorP.nc
index c83727bf1ba5f88392708f3c0be2db4e4adbd3b9..5a0f1b62be1a8f338a2f6ea4af873d58d8f8c232 100644 (file)
--- a/tos/lib/net/le/LinkEstimatorP.nc
+++ b/tos/lib/net/le/LinkEstimatorP.nc
@@ -252,7 +252,7 @@ implementation {
   // called when new beacon estimate is done
   // also called when new DEETX estimate is done
   void updateEETX(neighbor_table_entry_t *ne, uint16_t newEst) {
-    ne->eetx = (ALPHA * ne->eetx + (10 - ALPHA) * newEst)/10;
+    ne->eetx = (ALPHA * ne->eetx + (10 - ALPHA) * newEst + 5)/10;
   }
 
 
@@ -341,8 +341,8 @@ implementation {
              ne->inquality = (ALPHA * ne->inquality) / 10;
            } else {
              newEst = (255 * ne->rcvcnt) / totalPkt;
-             dbg("LI,LITest", "  %hu: %hhu -> %hhu", ne->ll_addr, ne->inquality, (ALPHA * ne->inquality + (10-ALPHA) * newEst)/10);
-             ne->inquality = (ALPHA * ne->inquality + (10-ALPHA) * newEst)/10;
+             dbg("LI,LITest", "  %hu: %hhu -> %hhu", ne->ll_addr, ne->inquality, (ALPHA * ne->inquality + (10-ALPHA) * newEst + 5)/10);
+             ne->inquality = (ALPHA * ne->inquality + (10-ALPHA) * newEst + 5)/10;
            }
            ne->rcvcnt = 0;
            ne->failcnt = 0;