From 6b3a8eff76f27f2b919887582006b2290d12ecfa Mon Sep 17 00:00:00 2001 From: Neale Ranns Date: Mon, 11 Sep 2017 10:34:33 -0700 Subject: replace uint32_t with u32 Change-Id: I6cab79c266837a8731adcf78c9e093dfa6be0ead Signed-off-by: Neale Ranns --- src/vnet/ethernet/arp.c | 4 ++-- src/vnet/interface_api.c | 2 +- src/vnet/ip/ip.h | 8 ++++---- src/vnet/ip/ip4_source_and_port_range_check.c | 2 +- src/vnet/ip/ip6_neighbor.c | 4 ++-- src/vnet/mpls/mpls.h | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/vnet/ethernet/arp.c b/src/vnet/ethernet/arp.c index 08e91373b64..957706c15e2 100644 --- a/src/vnet/ethernet/arp.c +++ b/src/vnet/ethernet/arp.c @@ -523,7 +523,7 @@ arp_update_adjacency (vnet_main_t * vnm, u32 sw_if_index, u32 ai) } static void -arp_adj_fib_add (ethernet_arp_ip4_entry_t * e, uint32_t fib_index) +arp_adj_fib_add (ethernet_arp_ip4_entry_t * e, u32 fib_index) { fib_prefix_t pfx = { .fp_len = 32, @@ -1568,7 +1568,7 @@ arp_add_del_interface_address (ip4_main_t * im, } void -arp_adj_fib_remove (ethernet_arp_ip4_entry_t * e, uint32_t fib_index) +arp_adj_fib_remove (ethernet_arp_ip4_entry_t * e, u32 fib_index) { if (FIB_NODE_INDEX_INVALID != e->fib_entry_index) { diff --git a/src/vnet/interface_api.c b/src/vnet/interface_api.c index 419fef94f63..0731ab35639 100644 --- a/src/vnet/interface_api.c +++ b/src/vnet/interface_api.c @@ -343,7 +343,7 @@ vl_api_sw_interface_set_table_t_handler (vl_api_sw_interface_set_table_t * mp) int ip_table_bind (fib_protocol_t fproto, - uint32_t sw_if_index, uint32_t table_id, u8 is_api) + u32 sw_if_index, u32 table_id, u8 is_api) { CLIB_UNUSED (ip_interface_address_t * ia); u32 fib_index, mfib_index; diff --git a/src/vnet/ip/ip.h b/src/vnet/ip/ip.h index 7aae73ff64a..788078666b8 100644 --- a/src/vnet/ip/ip.h +++ b/src/vnet/ip/ip.h @@ -184,12 +184,12 @@ void ip_del_all_interface_addresses (vlib_main_t * vm, u32 sw_if_index); extern vlib_node_registration_t ip4_inacl_node; extern vlib_node_registration_t ip6_inacl_node; -void ip_table_create (fib_protocol_t fproto, uint32_t table_id, u8 is_api); +void ip_table_create (fib_protocol_t fproto, u32 table_id, u8 is_api); -void ip_table_delete (fib_protocol_t fproto, uint32_t table_id, u8 is_api); +void ip_table_delete (fib_protocol_t fproto, u32 table_id, u8 is_api); -int ip_table_bind (fib_protocol_t fproto, - uint32_t sw_if_index, uint32_t table_id, u8 is_api); +int ip_table_bind (fib_protocol_t fproto, u32 sw_if_index, + u32 table_id, u8 is_api); #endif /* included_ip_main_h */ diff --git a/src/vnet/ip/ip4_source_and_port_range_check.c b/src/vnet/ip/ip4_source_and_port_range_check.c index 9aa880aee32..4829079bddd 100644 --- a/src/vnet/ip/ip4_source_and_port_range_check.c +++ b/src/vnet/ip/ip4_source_and_port_range_check.c @@ -1126,7 +1126,7 @@ ip6_source_and_port_range_check_add_del (ip6_address_t * address, u16 * low_ports, u16 * high_ports, int is_add) { - uint32_t fib_index; + u32 fib_index; fib_index = fib_table_find (FIB_PROTOCOL_IP4, vrf_id); diff --git a/src/vnet/ip/ip6_neighbor.c b/src/vnet/ip/ip6_neighbor.c index 56f33ac821d..345ebd34518 100644 --- a/src/vnet/ip/ip6_neighbor.c +++ b/src/vnet/ip/ip6_neighbor.c @@ -251,7 +251,7 @@ format_ip6_neighbor_ip6_entry (u8 * s, va_list * va) } static void -ip6_neighbor_adj_fib_remove (ip6_neighbor_t * n, uint32_t fib_index) +ip6_neighbor_adj_fib_remove (ip6_neighbor_t * n, u32 fib_index) { if (FIB_NODE_INDEX_INVALID != n->fib_entry_index) { @@ -589,7 +589,7 @@ ip6_ethernet_update_adjacency (vnet_main_t * vnm, u32 sw_if_index, u32 ai) static void -ip6_neighbor_adj_fib_add (ip6_neighbor_t * n, uint32_t fib_index) +ip6_neighbor_adj_fib_add (ip6_neighbor_t * n, u32 fib_index) { fib_prefix_t pfx = { .fp_len = 128, diff --git a/src/vnet/mpls/mpls.h b/src/vnet/mpls/mpls.h index 31cb1746f71..8dd92887c7d 100644 --- a/src/vnet/mpls/mpls.h +++ b/src/vnet/mpls/mpls.h @@ -98,7 +98,7 @@ mpls_fib_index_cmp(void * a1, void * a2); int mpls_label_cmp(void * a1, void * a2); -void mpls_table_create(uint32_t table_id, u8 is_api); -void mpls_table_delete(uint32_t table_id, u8 is_api); +void mpls_table_create(u32 table_id, u8 is_api); +void mpls_table_delete(u32 table_id, u8 is_api); #endif /* included_vnet_mpls_h */ -- cgit 1.2.3-korg