From d3c008d108aa2187d1a2afe2833b4de25ca2c2ab Mon Sep 17 00:00:00 2001 From: Christophe Fontaine Date: Mon, 2 Oct 2017 18:10:54 +0200 Subject: [aarch64] Fixes CLI crashes on dpaa2 platform. - always use 'va_args' as pointer in all format_* functions - u32 for all 'indent' params as it's declaration was inconsistent Change-Id: Ic5799309a6b104c9b50fec309cba789c8da99e79 Signed-off-by: Christophe Fontaine --- src/plugins/ixge/ixge.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/plugins/ixge/ixge.c') diff --git a/src/plugins/ixge/ixge.c b/src/plugins/ixge/ixge.c index 222c148c67d..5fd6a901e35 100644 --- a/src/plugins/ixge/ixge.c +++ b/src/plugins/ixge/ixge.c @@ -448,7 +448,7 @@ format_ixge_rx_from_hw_descriptor (u8 * s, va_list * va) va_arg (*va, ixge_rx_from_hw_descriptor_t *); u32 s0 = d->status[0], s2 = d->status[2]; u32 is_ip4, is_ip6, is_ip, is_tcp, is_udp; - uword indent = format_get_indent (s); + u32 indent = format_get_indent (s); s = format (s, "%s-owned", (s2 & IXGE_RX_DESCRIPTOR_STATUS2_IS_OWNED_BY_SOFTWARE) ? "sw" : @@ -517,7 +517,7 @@ format_ixge_tx_descriptor (u8 * s, va_list * va) { ixge_tx_descriptor_t *d = va_arg (*va, ixge_tx_descriptor_t *); u32 s0 = d->status0, s1 = d->status1; - uword indent = format_get_indent (s); + u32 indent = format_get_indent (s); u32 v; s = format (s, "buffer 0x%Lx, %d packet bytes, %d bytes this buffer", @@ -582,7 +582,7 @@ format_ixge_rx_dma_trace (u8 * s, va_list * va) ixge_main_t *xm = &ixge_main; ixge_device_t *xd = vec_elt_at_index (xm->devices, t->device_index); format_function_t *f; - uword indent = format_get_indent (s); + u32 indent = format_get_indent (s); { vnet_sw_interface_t *sw = @@ -869,7 +869,7 @@ format_ixge_tx_dma_trace (u8 * s, va_list * va) ixge_main_t *xm = &ixge_main; ixge_device_t *xd = vec_elt_at_index (xm->devices, t->device_index); format_function_t *f; - uword indent = format_get_indent (s); + u32 indent = format_get_indent (s); { vnet_sw_interface_t *sw = @@ -2344,7 +2344,7 @@ format_ixge_device (u8 * s, va_list * args) ixge_main_t *xm = &ixge_main; ixge_device_t *xd = vec_elt_at_index (xm->devices, dev_instance); ixge_phy_t *phy = xd->phys + xd->phy_index; - uword indent = format_get_indent (s); + u32 indent = format_get_indent (s); ixge_update_counters (xd); xd->link_status_at_last_link_change = xd->regs->xge_mac.link_status; -- cgit 1.2.3-korg