aboutsummaryrefslogtreecommitdiffstats
path: root/src/vnet/ethernet
diff options
context:
space:
mode:
authorChristophe Fontaine <christophe.fontaine@enea.com>2017-10-02 18:10:54 +0200
committerChris Luke <chris_luke@comcast.com>2017-10-04 17:31:13 +0000
commitd3c008d108aa2187d1a2afe2833b4de25ca2c2ab (patch)
tree03c85d4348fc955b33e6a6d628b5f8b81a2c8af6 /src/vnet/ethernet
parent9bce0f6d7c3f7f1d5f2989ff1157c2a1039cdef6 (diff)
[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 <christophe.fontaine@enea.com>
Diffstat (limited to 'src/vnet/ethernet')
-rw-r--r--src/vnet/ethernet/arp.c2
-rw-r--r--src/vnet/ethernet/format.c2
-rw-r--r--src/vnet/ethernet/sfp.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/vnet/ethernet/arp.c b/src/vnet/ethernet/arp.c
index 52b13e0401b..f46e6f5a5bc 100644
--- a/src/vnet/ethernet/arp.c
+++ b/src/vnet/ethernet/arp.c
@@ -203,7 +203,7 @@ format_ethernet_arp_header (u8 * s, va_list * va)
{
ethernet_arp_header_t *a = va_arg (*va, ethernet_arp_header_t *);
u32 max_header_bytes = va_arg (*va, u32);
- uword indent;
+ u32 indent;
u16 l2_type, l3_type;
if (max_header_bytes != 0 && sizeof (a[0]) > max_header_bytes)
diff --git a/src/vnet/ethernet/format.c b/src/vnet/ethernet/format.c
index 5b58999861a..13a209fb684 100644
--- a/src/vnet/ethernet/format.c
+++ b/src/vnet/ethernet/format.c
@@ -100,7 +100,7 @@ format_ethernet_header_with_length (u8 * s, va_list * args)
ethernet_type_t type = clib_net_to_host_u16 (e->type);
ethernet_type_t vlan_type[ARRAY_LEN (m->vlan)];
u32 n_vlan = 0, i, header_bytes;
- uword indent;
+ u32 indent;
while ((type == ETHERNET_TYPE_VLAN || type == ETHERNET_TYPE_DOT1AD
|| type == ETHERNET_TYPE_DOT1AH) && n_vlan < ARRAY_LEN (m->vlan))
diff --git a/src/vnet/ethernet/sfp.c b/src/vnet/ethernet/sfp.c
index 624740e3d52..0ebdb99339b 100644
--- a/src/vnet/ethernet/sfp.c
+++ b/src/vnet/ethernet/sfp.c
@@ -81,7 +81,7 @@ u8 *
format_sfp_eeprom (u8 * s, va_list * args)
{
sfp_eeprom_t *e = va_arg (*args, sfp_eeprom_t *);
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
int i;
if (e->id != SFP_ID_sfp)