From 8609d1e7902518f18292ce79778058c5a750884b Mon Sep 17 00:00:00 2001
From: Simon Goldschmidt <goldsimon@gmx.de>
Date: Wed, 24 Apr 2013 21:58:57 +0200
Subject: [PATCH] fixed bug #38526 Coverity: Recursive Header Inclusion in
 ip6.h

---
 CHANGELOG                   | 3 +++
 src/core/ipv6/icmp6.c       | 1 +
 src/core/ipv6/ip6_frag.c    | 1 +
 src/core/ipv6/mld6.c        | 1 +
 src/core/ipv6/nd6.c         | 1 +
 src/include/ipv6/lwip/ip6.h | 2 +-
 6 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 3f75c1ae..54cc1194 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -80,6 +80,9 @@ HISTORY
 
  ++ Bugfixes:
 
+  2013-04-24: Simon Goldschmidt
+  * ip6.h, some ipv6 C files: fixed bug #38526 Coverity: Recursive Header Inclusion in ip6.h
+
   2013-04-24: Simon Goldschmidt (patch by Emil Ljungdahl):
   * netif.c: fixed bug #38586 netif_loop_output() "deadlocks"
 
diff --git a/src/core/ipv6/icmp6.c b/src/core/ipv6/icmp6.c
index ea82682e..bad7930d 100644
--- a/src/core/ipv6/icmp6.c
+++ b/src/core/ipv6/icmp6.c
@@ -51,6 +51,7 @@
 #include "lwip/netif.h"
 #include "lwip/nd6.h"
 #include "lwip/mld6.h"
+#include "lwip/ip.h"
 #include "lwip/stats.h"
 
 #include <string.h>
diff --git a/src/core/ipv6/ip6_frag.c b/src/core/ipv6/ip6_frag.c
index a43fd614..47882d4e 100644
--- a/src/core/ipv6/ip6_frag.c
+++ b/src/core/ipv6/ip6_frag.c
@@ -44,6 +44,7 @@
 #include "lwip/ip6.h"
 #include "lwip/icmp6.h"
 #include "lwip/nd6.h"
+#include "lwip/ip.h"
 
 #include "lwip/pbuf.h"
 #include "lwip/memp.h"
diff --git a/src/core/ipv6/mld6.c b/src/core/ipv6/mld6.c
index 1cb2dd9c..bffd97f1 100644
--- a/src/core/ipv6/mld6.c
+++ b/src/core/ipv6/mld6.c
@@ -50,6 +50,7 @@
 #include "lwip/icmp6.h"
 #include "lwip/ip6.h"
 #include "lwip/ip6_addr.h"
+#include "lwip/ip.h"
 #include "lwip/inet_chksum.h"
 #include "lwip/pbuf.h"
 #include "lwip/netif.h"
diff --git a/src/core/ipv6/nd6.c b/src/core/ipv6/nd6.c
index 44629dbe..1a43a371 100644
--- a/src/core/ipv6/nd6.c
+++ b/src/core/ipv6/nd6.c
@@ -55,6 +55,7 @@
 #include "lwip/netif.h"
 #include "lwip/icmp6.h"
 #include "lwip/mld6.h"
+#include "lwip/ip.h"
 #include "lwip/stats.h"
 
 #include <string.h>
diff --git a/src/include/ipv6/lwip/ip6.h b/src/include/ipv6/lwip/ip6.h
index b199c95a..860d3e92 100644
--- a/src/include/ipv6/lwip/ip6.h
+++ b/src/include/ipv6/lwip/ip6.h
@@ -45,7 +45,7 @@
 
 #if LWIP_IPV6  /* don't build if not configured for use in lwipopts.h */
 
-#include "lwip/ip.h"
+//#include "lwip/ip.h"
 #include "lwip/ip6_addr.h"
 #include "lwip/def.h"
 #include "lwip/pbuf.h"