From a05d635512b460f426013fad2696b26eeef1246f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Dawans?= <sebastien.dawans@cetic.be>
Date: Thu, 25 Jul 2013 11:22:38 +0200
Subject: [PATCH] Improve readability of DAO output variables

---
 core/net/rpl/rpl-icmp6.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/core/net/rpl/rpl-icmp6.c b/core/net/rpl/rpl-icmp6.c
index 4f3f6c4c9..6c2f9d737 100644
--- a/core/net/rpl/rpl-icmp6.c
+++ b/core/net/rpl/rpl-icmp6.c
@@ -707,7 +707,7 @@ dao_input(void)
 }
 /*---------------------------------------------------------------------------*/
 void
-dao_output(rpl_parent_t *n, uint8_t lifetime)
+dao_output(rpl_parent_t *parent, uint8_t lifetime)
 {
   /* Destination Advertisement Object */
   uip_ipaddr_t prefix;
@@ -717,11 +717,12 @@ dao_output(rpl_parent_t *n, uint8_t lifetime)
     return;
   }
 
-  dao_output_target(n, &prefix, lifetime);
+  /* Sending a DAO with own prefix as target */
+  dao_output_target(parent, &prefix, lifetime);
 }
 /*---------------------------------------------------------------------------*/
 void
-dao_output_target(rpl_parent_t *n, uip_ipaddr_t *prefix, uint8_t lifetime)
+dao_output_target(rpl_parent_t *parent, uip_ipaddr_t *prefix, uint8_t lifetime)
 {
   rpl_dag_t *dag;
   rpl_instance_t *instance;
@@ -731,11 +732,11 @@ dao_output_target(rpl_parent_t *n, uip_ipaddr_t *prefix, uint8_t lifetime)
 
   /* Destination Advertisement Object */
 
-  dag = n->dag;
+  dag = parent->dag;
   instance = dag->instance;
 
 #ifdef RPL_DEBUG_DAO_OUTPUT
-  RPL_DEBUG_DAO_OUTPUT(n);
+  RPL_DEBUG_DAO_OUTPUT(parent);
 #endif
 
   buffer = UIP_ICMP_PAYLOAD;
@@ -779,10 +780,10 @@ dao_output_target(rpl_parent_t *n, uip_ipaddr_t *prefix, uint8_t lifetime)
   PRINTF("RPL: Sending DAO with prefix ");
   PRINT6ADDR(prefix);
   PRINTF(" to ");
-  PRINT6ADDR(&n->addr);
+  PRINT6ADDR(&parent->addr);
   PRINTF("\n");
 
-  uip_icmp6_send(&n->addr, ICMP6_RPL, RPL_CODE_DAO, pos);
+  uip_icmp6_send(&parent->addr, ICMP6_RPL, RPL_CODE_DAO, pos);
 }
 /*---------------------------------------------------------------------------*/
 static void