Merge over into the trunk.

[tinyos-2.x.git] / tos / lib / net / collection / TreeRoutingEngineP.nc

diff --git a/tos/lib/net/collection/TreeRoutingEngineP.nc b/tos/lib/net/collection/TreeRoutingEngineP.nc
index b168c8ce925ab333122020e186b3fe3b0418a814..7244e126491764421e3200a9f33e81685051ae30 100644 (file)
--- a/tos/lib/net/collection/TreeRoutingEngineP.nc
+++ b/tos/lib/net/collection/TreeRoutingEngineP.nc
@@ -250,7 +250,9 @@ implementation {
                   i, entry->neighbor, entry->info.parent, entry->info.hopcount);
               continue;
             }
-            
+           if (TOS_NODE_ID > 10 && entry->neighbor == 0) {
+             continue;
+           }
             /* Compute this neighbor's path metric */
             linkMetric = evaluateMetric(call LinkEstimator.getLinkQuality(entry->neighbor));
             dbg("TreeRouting", 
@@ -293,6 +295,7 @@ implementation {
                 call CollectionDebug.logEventRoute(NET_C_TREE_NEW_PARENT, best->neighbor, best->info.hopcount + 1, best->info.metric); 
                 call LinkEstimator.unpinNeighbor(routeInfo.parent);
                 call LinkEstimator.pinNeighbor(best->neighbor);
+               call LinkEstimator.clearDLQ(best->neighbor);
                 atomic {
                     routeInfo.parent = best->neighbor;
                     routeInfo.metric = best->info.metric;