From 6de597c04fab110ee74478cbdc06a78546f3001f Mon Sep 17 00:00:00 2001
From: Helin Zhang <helin.zhang@intel.com>
Date: Wed, 2 Jul 2014 15:29:52 +0800
Subject: [PATCH] bond: fix build on 32-bit Oracle Linux 6.4

The compile error on 32 bits Oracle Linux 6.4 is as below.

Kernel: 2.6.39
GCC: 4.4.7 20120313

In file included from /usr/include/stdlib.h:320,
from i686-native-linuxapp-gcc/include/rte_mempool.h:63,
from i686-native-linuxapp-gcc/include/rte_mbuf.h:61,
from lib/librte_pmd_bond/rte_eth_bond_api.c:37:
/usr/include/sys/types.h:61: error: conflicting types for dev_t
/usr/include/linux/types.h:22: note: previous declaration of dev_t was here
/usr/include/sys/types.h:66: error: conflicting types for gid_t
/usr/include/linux/types.h:52: note: previous declaration of gid_t was here
/usr/include/sys/types.h:71: error: conflicting types for mode_t
/usr/include/linux/types.h:24: note: previous declaration of mode_t was here
/usr/include/sys/types.h:76: error: conflicting types for nlink_t
/usr/include/linux/types.h:25: note: previous declaration of nlink_t was here
/usr/include/sys/types.h:81: error: conflicting types for uid_t
/usr/include/linux/types.h:51: note: previous declaration of uid_t was here

Signed-off-by: Helin Zhang <helin.zhang@intel.com>
Acked-by: Cunming Liang <cunming.liang@intel.com>
---
 lib/librte_pmd_bond/rte_eth_bond_api.c | 14 ++------------
 lib/librte_pmd_bond/rte_eth_bond_pmd.c | 15 +++++----------
 2 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/lib/librte_pmd_bond/rte_eth_bond_api.c b/lib/librte_pmd_bond/rte_eth_bond_api.c
index 9be5f7206a..75f5694fbb 100644
--- a/lib/librte_pmd_bond/rte_eth_bond_api.c
+++ b/lib/librte_pmd_bond/rte_eth_bond_api.c
@@ -31,20 +31,10 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/queue.h>
-#include <linux/binfmts.h>
-
 #include <rte_mbuf.h>
-#include <rte_cycles.h>
-#include <rte_dev.h>
-#include <rte_devargs.h>
-#include <rte_ethdev.h>
-#include <rte_ip.h>
-#include <rte_kvargs.h>
 #include <rte_malloc.h>
-#include <rte_memcpy.h>
-#include <rte_memory.h>
-#include <rte_udp.h>
+#include <rte_ethdev.h>
+#include <rte_tcp.h>
 
 #include "rte_eth_bond.h"
 #include "rte_eth_bond_private.h"
diff --git a/lib/librte_pmd_bond/rte_eth_bond_pmd.c b/lib/librte_pmd_bond/rte_eth_bond_pmd.c
index aa910ba9f6..048de7f3b7 100644
--- a/lib/librte_pmd_bond/rte_eth_bond_pmd.c
+++ b/lib/librte_pmd_bond/rte_eth_bond_pmd.c
@@ -31,20 +31,15 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/queue.h>
-#include <linux/binfmts.h>
-
 #include <rte_mbuf.h>
-#include <rte_cycles.h>
-#include <rte_dev.h>
-#include <rte_devargs.h>
+#include <rte_malloc.h>
 #include <rte_ethdev.h>
+#include <rte_tcp.h>
+#include <rte_udp.h>
 #include <rte_ip.h>
+#include <rte_devargs.h>
 #include <rte_kvargs.h>
-#include <rte_malloc.h>
-#include <rte_memcpy.h>
-#include <rte_memory.h>
-#include <rte_udp.h>
+#include <rte_dev.h>
 
 #include "rte_eth_bond.h"
 #include "rte_eth_bond_private.h"
-- 
2.20.1