From ad942d78c1b5c0fd558ac7c069278c7c37ddaa68 Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas.monjalon@6wind.com>
Date: Tue, 17 Jun 2014 02:31:30 +0200
Subject: [PATCH] ip_frag: clean includes

Add required rte_byteorder in rte_ip_frag.h.
Remove useless includes in *.c files.

Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
---
 lib/librte_ip_frag/ip_frag_internal.c       | 3 ---
 lib/librte_ip_frag/rte_ip_frag.h            | 1 +
 lib/librte_ip_frag/rte_ip_frag_common.c     | 3 ---
 lib/librte_ip_frag/rte_ipv4_fragmentation.c | 5 -----
 lib/librte_ip_frag/rte_ipv4_reassembly.c    | 8 --------
 lib/librte_ip_frag/rte_ipv6_fragmentation.c | 4 ----
 lib/librte_ip_frag/rte_ipv6_reassembly.c    | 6 ------
 7 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/lib/librte_ip_frag/ip_frag_internal.c b/lib/librte_ip_frag/ip_frag_internal.c
index 5d3503788b..cfcab1bd20 100644
--- a/lib/librte_ip_frag/ip_frag_internal.c
+++ b/lib/librte_ip_frag/ip_frag_internal.c
@@ -32,15 +32,12 @@
  */
 
 #include <stddef.h>
-#include <stdint.h>
 
-#include <rte_byteorder.h>
 #include <rte_jhash.h>
 #ifdef RTE_MACHINE_CPUFLAG_SSE4_2
 #include <rte_hash_crc.h>
 #endif /* RTE_MACHINE_CPUFLAG_SSE4_2 */
 
-#include "rte_ip_frag.h"
 #include "ip_frag_common.h"
 
 #define	PRIME_VALUE	0xeaad8405
diff --git a/lib/librte_ip_frag/rte_ip_frag.h b/lib/librte_ip_frag/rte_ip_frag.h
index 13249d3329..f1e7036f2f 100644
--- a/lib/librte_ip_frag/rte_ip_frag.h
+++ b/lib/librte_ip_frag/rte_ip_frag.h
@@ -47,6 +47,7 @@
 #include <rte_malloc.h>
 #include <rte_mbuf.h>
 #include <rte_ip.h>
+#include <rte_byteorder.h>
 
 enum {
 	IP_LAST_FRAG_IDX,    /**< index of last fragment */
diff --git a/lib/librte_ip_frag/rte_ip_frag_common.c b/lib/librte_ip_frag/rte_ip_frag_common.c
index acd1864eac..e4d16d0c2c 100644
--- a/lib/librte_ip_frag/rte_ip_frag_common.c
+++ b/lib/librte_ip_frag/rte_ip_frag_common.c
@@ -32,14 +32,11 @@
  */
 
 #include <stddef.h>
-#include <stdint.h>
 #include <stdio.h>
 
 #include <rte_memory.h>
 #include <rte_log.h>
-#include <rte_byteorder.h>
 
-#include "rte_ip_frag.h"
 #include "ip_frag_common.h"
 
 #define	IP_FRAG_HASH_FNUM	2
diff --git a/lib/librte_ip_frag/rte_ipv4_fragmentation.c b/lib/librte_ip_frag/rte_ipv4_fragmentation.c
index 7ec20cf522..3ab665f46c 100644
--- a/lib/librte_ip_frag/rte_ipv4_fragmentation.c
+++ b/lib/librte_ip_frag/rte_ipv4_fragmentation.c
@@ -32,17 +32,12 @@
  */
 
 #include <stddef.h>
-#include <stdint.h>
 #include <errno.h>
 
-#include <rte_byteorder.h>
 #include <rte_memcpy.h>
 #include <rte_mempool.h>
 #include <rte_debug.h>
-#include <rte_mbuf.h>
-#include <rte_ip.h>
 
-#include "rte_ip_frag.h"
 #include "ip_frag_common.h"
 
 /* Fragment Offset */
diff --git a/lib/librte_ip_frag/rte_ipv4_reassembly.c b/lib/librte_ip_frag/rte_ipv4_reassembly.c
index cc9a9c8464..cbac413a2e 100644
--- a/lib/librte_ip_frag/rte_ipv4_reassembly.c
+++ b/lib/librte_ip_frag/rte_ipv4_reassembly.c
@@ -31,19 +31,11 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-
-
 #include <stddef.h>
-#include <stdint.h>
 
-#include <rte_byteorder.h>
-#include <rte_mbuf.h>
 #include <rte_debug.h>
 #include <rte_tailq.h>
-#include <rte_malloc.h>
-#include <rte_ip.h>
 
-#include "rte_ip_frag.h"
 #include "ip_frag_common.h"
 
 /*
diff --git a/lib/librte_ip_frag/rte_ipv6_fragmentation.c b/lib/librte_ip_frag/rte_ipv6_fragmentation.c
index e8f137cfc5..6b660c4062 100644
--- a/lib/librte_ip_frag/rte_ipv6_fragmentation.c
+++ b/lib/librte_ip_frag/rte_ipv6_fragmentation.c
@@ -32,14 +32,10 @@
  */
 
 #include <stddef.h>
-#include <stdint.h>
 #include <errno.h>
 
-#include <rte_byteorder.h>
 #include <rte_memcpy.h>
-#include <rte_ip.h>
 
-#include "rte_ip_frag.h"
 #include "ip_frag_common.h"
 
 /**
diff --git a/lib/librte_ip_frag/rte_ipv6_reassembly.c b/lib/librte_ip_frag/rte_ipv6_reassembly.c
index c6522508c4..1d83c79eec 100644
--- a/lib/librte_ip_frag/rte_ipv6_reassembly.c
+++ b/lib/librte_ip_frag/rte_ipv6_reassembly.c
@@ -32,15 +32,9 @@
  */
 
 #include <stddef.h>
-#include <stdint.h>
 
-#include <rte_malloc.h>
 #include <rte_memcpy.h>
-#include <rte_byteorder.h>
-#include <rte_mbuf.h>
-#include <rte_ip.h>
 
-#include "rte_ip_frag.h"
 #include "ip_frag_common.h"
 
 /**
-- 
2.20.1