From 7f9505970314badc574a3e711a270b46527afa9a Mon Sep 17 00:00:00 2001
From: adamdunkels <adamdunkels>
Date: Sun, 24 Oct 2010 21:04:39 +0000
Subject: [PATCH] The collect view functions now take the node's routing
 metric, not the parent's routing metric.

---
 apps/shell/shell-collect-view.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/apps/shell/shell-collect-view.c b/apps/shell/shell-collect-view.c
index b9475fccc..cc87e0902 100644
--- a/apps/shell/shell-collect-view.c
+++ b/apps/shell/shell-collect-view.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-collect-view.c,v 1.1 2010/10/20 15:21:43 adamdunkels Exp $
+ * $Id: shell-collect-view.c,v 1.2 2010/10/24 21:04:39 adamdunkels Exp $
  */
 
 /**
@@ -54,7 +54,7 @@ PROCESS_THREAD(collect_view_data_process, ev, data)
 {
   struct collect_view_data_msg msg;
   struct collect_neighbor *n;
-  uint16_t parent_etx, parent_rtmetric;
+  uint16_t parent_etx;
   uint16_t num_neighbors;
   uint16_t beacon_interval;
   
@@ -64,16 +64,14 @@ PROCESS_THREAD(collect_view_data_process, ev, data)
                                  &shell_collect_conn.parent);
   if(n != NULL) {
     parent_etx = collect_neighbor_link_estimate(n);
-    parent_rtmetric = n->rtmetric;
   } else {
     parent_etx = 0;
-    parent_rtmetric = 0;
   }
   num_neighbors = collect_neighbor_list_num(&shell_collect_conn.neighbor_list);
   beacon_interval = broadcast_announcement_beacon_interval() / CLOCK_SECOND;
 
   collect_view_construct_message(&msg, &shell_collect_conn.parent,
-                                 parent_etx, parent_rtmetric,
+                                 parent_etx, shell_collect_conn.rtmetric,
                                  num_neighbors, beacon_interval);
   shell_output(&collect_view_data_command, &msg, sizeof(msg), "", 0);