From 8552fb1eadc1346344aa4c54024ae1ed58b6b3f6 Mon Sep 17 00:00:00 2001
From: Ioannis Glaropoulos <ioannisg@kth.se>
Date: Mon, 9 Mar 2015 19:41:25 +0100
Subject: [PATCH] Send the first NS attempt inside tcpip_ipv6_output()

---
 core/net/ip/tcpip.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/net/ip/tcpip.c b/core/net/ip/tcpip.c
index 6f2744785..a6fdf1fe1 100644
--- a/core/net/ip/tcpip.c
+++ b/core/net/ip/tcpip.c
@@ -675,7 +675,11 @@ tcpip_ipv6_output(void)
 
         stimer_set(&nbr->sendns, uip_ds6_if.retrans_timer / 1000);
         nbr->nscount = 1;
+        /* Send the first NS try from here (multicast destination IP address). */
       }
+#else /* UIP_ND6_SEND_NA */
+      uip_len = 0;
+      return;  
 #endif /* UIP_ND6_SEND_NA */
     } else {
 #if UIP_ND6_SEND_NA
@@ -722,7 +726,6 @@ tcpip_ipv6_output(void)
       uip_len = 0;
       return;
     }
-    return;
   }
   /* Multicast IP destination address. */
   tcpip_output(NULL);