From bc762b6dd623472e1ffbf65cdd888de1aa615c65 Mon Sep 17 00:00:00 2001
From: Brad Campbell <bradjc5@gmail.com>
Date: Mon, 9 Sep 2013 20:48:11 -0400
Subject: [PATCH] Small fixes to networking files

1. Added #include header
2. Fixed #defines that weren't updated
3. Small change to comment that now points to correct RFC section
---
 core/net/tcpip.c         | 2 +-
 core/net/uip-ds6-nbr.c   | 5 +++--
 core/net/uip-ds6-route.h | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/net/tcpip.c b/core/net/tcpip.c
index 5a94a1688..1bd84f6e2 100644
--- a/core/net/tcpip.c
+++ b/core/net/tcpip.c
@@ -693,7 +693,7 @@ tcpip_ipv6_output(void)
         return;
       }
       /* Send in parallel if we are running NUD (nbc state is either STALE,
-         DELAY, or PROBE). See RFC 4861, section 7.7.3 on node behavior. */
+         DELAY, or PROBE). See RFC 4861, section 7.3.3 on node behavior. */
       if(nbr->state == NBR_STALE) {
         nbr->state = NBR_DELAY;
         stimer_set(&nbr->reachable, UIP_ND6_DELAY_FIRST_PROBE_TIME);
diff --git a/core/net/uip-ds6-nbr.c b/core/net/uip-ds6-nbr.c
index 43a16f4f4..924e9ba3d 100644
--- a/core/net/uip-ds6-nbr.c
+++ b/core/net/uip-ds6-nbr.c
@@ -205,8 +205,9 @@ uip_ds6_link_neighbor_callback(int status, int numtx)
     uip_ds6_nbr_t *nbr;
     nbr = uip_ds6_nbr_ll_lookup((uip_lladdr_t *)dest);
     if(nbr != NULL &&
-        (nbr->state == STALE || nbr->state == DELAY || nbr->state == PROBE)) {
-      nbr->state = REACHABLE;
+        (nbr->state == NBR_STALE || nbr->state == NBR_DELAY ||
+         nbr->state == NBR_PROBE)) {
+      nbr->state = NBR_REACHABLE;
       stimer_set(&nbr->reachable, UIP_ND6_REACHABLE_TIME / 1000);
       PRINTF("uip-ds6-neighbor : received a link layer ACK : ");
       PRINTLLADDR((uip_lladdr_t *)dest);
diff --git a/core/net/uip-ds6-route.h b/core/net/uip-ds6-route.h
index 35e7e60d0..2a3741da7 100644
--- a/core/net/uip-ds6-route.h
+++ b/core/net/uip-ds6-route.h
@@ -32,6 +32,7 @@
 #ifndef UIP_DS6_ROUTE_H
 #define UIP_DS6_ROUTE_H
 
+#include "sys/stimer.h"
 #include "lib/list.h"
 
 void uip_ds6_route_init(void);