aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2017-04-26 15:32:12 +0200
committerFlorin Coras <florin.coras@gmail.com>2017-05-09 17:52:43 +0000
commit7bee80c823ca77de3aca803fdede77e4c7385a52 (patch)
tree827e8815fe68d70a5220a3e2890d37c299845e6d /src/plugins
parentb0972cbb35550619483b90004a00566f9641f983 (diff)
Fix remaining 32-bit compile issues
Change-Id: I9664214652229b663c3e3ba7406b4ede96bfb123 Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/dpdk/buffer.c6
-rw-r--r--src/plugins/ixge/ixge.c5
2 files changed, 6 insertions, 5 deletions
diff --git a/src/plugins/dpdk/buffer.c b/src/plugins/dpdk/buffer.c
index c80b3fa8875..2d4762abc29 100644
--- a/src/plugins/dpdk/buffer.c
+++ b/src/plugins/dpdk/buffer.c
@@ -455,8 +455,8 @@ vlib_buffer_pool_create (vlib_main_t * vm, unsigned num_mbufs,
uword save_vpm_start, save_vpm_end, save_vpm_size;
struct rte_mempool_memhdr *memhdr;
- this_pool_start = ~0ULL;
- this_pool_end = 0LL;
+ this_pool_start = ~0;
+ this_pool_end = 0;
STAILQ_FOREACH (memhdr, &rmp->mem_list, next)
{
@@ -465,7 +465,7 @@ vlib_buffer_pool_create (vlib_main_t * vm, unsigned num_mbufs,
if (((uword) memhdr->addr) < this_pool_start)
this_pool_start = (uword) (memhdr->addr);
}
- ASSERT (this_pool_start < ~0ULL && this_pool_end > 0);
+ ASSERT (this_pool_start < ~0 && this_pool_end > 0);
this_pool_size = this_pool_end - this_pool_start;
if (CLIB_DEBUG > 1)
diff --git a/src/plugins/ixge/ixge.c b/src/plugins/ixge/ixge.c
index 08f5b6922df..0d287250ca4 100644
--- a/src/plugins/ixge/ixge.c
+++ b/src/plugins/ixge/ixge.c
@@ -20,7 +20,7 @@
* Please use supported DPDK driver instead.
*/
-#if __x86_64__
+#if __x86_64__ || __i386__
#include <vppinfra/vector.h>
#ifndef CLIB_HAVE_VEC128
@@ -2929,7 +2929,6 @@ ixge_set_next_node (ixge_rx_next_t next, char *name)
break;
}
}
-#endif
/* *INDENT-OFF* */
VLIB_PLUGIN_REGISTER () = {
@@ -2937,8 +2936,10 @@ VLIB_PLUGIN_REGISTER () = {
.default_disabled = 1,
.description = "Intel 82599 Family Native Driver (experimental)",
};
+#endif
/* *INDENT-ON* */
+
/*
* fd.io coding-style-patch-verification: ON
*