From 13501503a69b96b5818292eaf0014a6c12d9b3b1 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson@intel.com>
Date: Thu, 23 Apr 2015 14:03:50 +0100
Subject: [PATCH] distributor: remove inclusion of mbuf header

The distributor header file includes the mbuf header file, but it does not
need to do so as it only uses pointers to the struct rte_mbuf type, and
does not use any of the mbuf internals, nor any of the mbuf functions or
macros. Therefore the inclusion is unnecessary, and can be replaced by a
forward declaration of the mbuf type.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Olivier Matz <olivier.matz@6wind.com>
---
 app/test/test_distributor.c              | 2 ++
 app/test/test_distributor_perf.c         | 3 +++
 lib/librte_distributor/rte_distributor.h | 3 +--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/test/test_distributor.c b/app/test/test_distributor.c
index ad4698763f..afe33a7fce 100644
--- a/app/test/test_distributor.c
+++ b/app/test/test_distributor.c
@@ -37,6 +37,8 @@
 #include <string.h>
 #include <rte_cycles.h>
 #include <rte_errno.h>
+#include <rte_mempool.h>
+#include <rte_mbuf.h>
 #include <rte_distributor.h>
 
 #define ITER_POWER 20 /* log 2 of how many iterations we do when timing. */
diff --git a/app/test/test_distributor_perf.c b/app/test/test_distributor_perf.c
index f04cb156d6..4ed3552c9b 100644
--- a/app/test/test_distributor_perf.c
+++ b/app/test/test_distributor_perf.c
@@ -35,7 +35,10 @@
 
 #include <unistd.h>
 #include <string.h>
+#include <rte_mempool.h>
 #include <rte_cycles.h>
+#include <rte_common.h>
+#include <rte_mbuf.h>
 #include <rte_distributor.h>
 
 #define ITER_POWER 20 /* log 2 of how many iterations we do when timing. */
diff --git a/lib/librte_distributor/rte_distributor.h b/lib/librte_distributor/rte_distributor.h
index cc1d559071..7d36bc8a6a 100644
--- a/lib/librte_distributor/rte_distributor.h
+++ b/lib/librte_distributor/rte_distributor.h
@@ -46,11 +46,10 @@
 extern "C" {
 #endif
 
-#include <rte_mbuf.h>
-
 #define RTE_DISTRIBUTOR_NAMESIZE 32 /**< Length of name for instance */
 
 struct rte_distributor;
+struct rte_mbuf;
 
 /**
  * Function to create a new distributor instance
-- 
2.20.1