1 files changed, 23 insertions, 21 deletions

diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index f89656201c..d491982d62 100644
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -125,7 +125,7 @@ _rnode_zlog(const char *_func, vrf_id_t vrf_id, struct route_node *rn,
 	va_end(ap);
 
 	if (rn) {
-		rib_table_info_t *info = srcdest_rnode_table_info(rn);
+		struct rib_table_info *info = srcdest_rnode_table_info(rn);
 		srcdest_rnode2str(rn, buf, sizeof(buf));
 
 		if (info->safi == SAFI_MULTICAST)
@@ -211,28 +211,29 @@ static void route_entry_attach_ref(struct route_entry *re,
 	zebra_nhg_increment_ref(new);
 }
 
-int route_entry_update_nhe(struct route_entry *re, struct nhg_hash_entry *new)
+int route_entry_update_nhe(struct route_entry *re,
+			   struct nhg_hash_entry *new_nhghe)
 {
 	struct nhg_hash_entry *old;
 	int ret = 0;
 
-	if (new == NULL) {
+	if (new_nhghe == NULL) {
 		if (re->nhe)
 			zebra_nhg_decrement_ref(re->nhe);
 		re->nhe = NULL;
 		goto done;
 	}
 
-	if ((re->nhe_id != 0) && (re->nhe_id != new->id)) {
+	if ((re->nhe_id != 0) && (re->nhe_id != new_nhghe->id)) {
 		old = re->nhe;
 
-		route_entry_attach_ref(re, new);
+		route_entry_attach_ref(re, new_nhghe);
 
 		if (old)
 			zebra_nhg_decrement_ref(old);
 	} else if (!re->nhe)
 		/* This is the first time it's being attached */
-		route_entry_attach_ref(re, new);
+		route_entry_attach_ref(re, new_nhghe);
 
 done:
 	return ret;
@@ -420,7 +421,7 @@ void rib_install_kernel(struct route_node *rn, struct route_entry *re,
 			struct route_entry *old)
 {
 	struct nexthop *nexthop;
-	rib_table_info_t *info = srcdest_rnode_table_info(rn);
+	struct rib_table_info *info = srcdest_rnode_table_info(rn);
 	struct zebra_vrf *zvrf = vrf_info_lookup(re->vrf_id);
 	const struct prefix *p, *src_p;
 	enum zebra_dplane_result ret;
@@ -503,7 +504,7 @@ void rib_install_kernel(struct route_node *rn, struct route_entry *re,
 void rib_uninstall_kernel(struct route_node *rn, struct route_entry *re)
 {
 	struct nexthop *nexthop;
-	rib_table_info_t *info = srcdest_rnode_table_info(rn);
+	struct rib_table_info *info = srcdest_rnode_table_info(rn);
 	struct zebra_vrf *zvrf = vrf_info_lookup(re->vrf_id);
 
 	if (info->safi != SAFI_UNICAST) {
@@ -546,7 +547,7 @@ void rib_uninstall_kernel(struct route_node *rn, struct route_entry *re)
 /* Uninstall the route from kernel. */
 static void rib_uninstall(struct route_node *rn, struct route_entry *re)
 {
-	rib_table_info_t *info = srcdest_rnode_table_info(rn);
+	struct rib_table_info *info = srcdest_rnode_table_info(rn);
 	rib_dest_t *dest = rib_dest_from_rnode(rn);
 	struct nexthop *nexthop;
 
@@ -3085,7 +3086,7 @@ int rib_add(afi_t afi, safi_t safi, vrf_id_t vrf_id, int type,
 	return rib_add_multipath(afi, safi, p, src_p, re, ng);
 }
 
-static const char *rib_update_event2str(rib_update_event_t event)
+static const char *rib_update_event2str(enum rib_update_event event)
 {
 	const char *ret = "UNKNOWN";
 
@@ -3125,7 +3126,7 @@ static void rib_update_route_node(struct route_node *rn, int type)
 }
 
 /* Schedule routes of a particular table (address-family) based on event. */
-void rib_update_table(struct route_table *table, rib_update_event_t event)
+void rib_update_table(struct route_table *table, enum rib_update_event event)
 {
 	struct route_node *rn;
 
@@ -3133,13 +3134,14 @@ void rib_update_table(struct route_table *table, rib_update_event_t event)
 		struct zebra_vrf *zvrf;
 		struct vrf *vrf;
 
-		zvrf = table->info ? ((rib_table_info_t *)table->info)->zvrf
-				   : NULL;
+		zvrf = table->info
+			       ? ((struct rib_table_info *)table->info)->zvrf
+			       : NULL;
 		vrf = zvrf ? zvrf->vrf : NULL;
 
 		zlog_debug("%s: %s VRF %s Table %u event %s", __func__,
 			   table->info ? afi2str(
-				   ((rib_table_info_t *)table->info)->afi)
+				   ((struct rib_table_info *)table->info)->afi)
 				       : "Unknown",
 			   VRF_LOGNAME(vrf), zvrf ? zvrf->table_id : 0,
 			   rib_update_event2str(event));
@@ -3173,7 +3175,7 @@ void rib_update_table(struct route_table *table, rib_update_event_t event)
 	}
 }
 
-static void rib_update_handle_vrf(vrf_id_t vrf_id, rib_update_event_t event)
+static void rib_update_handle_vrf(vrf_id_t vrf_id, enum rib_update_event event)
 {
 	struct route_table *table;
 
@@ -3191,7 +3193,7 @@ static void rib_update_handle_vrf(vrf_id_t vrf_id, rib_update_event_t event)
 		rib_update_table(table, event);
 }
 
-static void rib_update_handle_vrf_all(rib_update_event_t event)
+static void rib_update_handle_vrf_all(enum rib_update_event event)
 {
 	struct zebra_router_table *zrt;
 
@@ -3205,13 +3207,13 @@ static void rib_update_handle_vrf_all(rib_update_event_t event)
 }
 
 struct rib_update_ctx {
-	rib_update_event_t event;
+	enum rib_update_event event;
 	bool vrf_all;
 	vrf_id_t vrf_id;
 };
 
 static struct rib_update_ctx *rib_update_ctx_init(vrf_id_t vrf_id,
-						  rib_update_event_t event)
+						  enum rib_update_event event)
 {
 	struct rib_update_ctx *ctx;
 
@@ -3251,7 +3253,7 @@ static int rib_update_handler(struct thread *thread)
 static struct thread *t_rib_update_threads[RIB_UPDATE_MAX];
 
 /* Schedule a RIB update event for specific vrf */
-void rib_update_vrf(vrf_id_t vrf_id, rib_update_event_t event)
+void rib_update_vrf(vrf_id_t vrf_id, enum rib_update_event event)
 {
 	struct rib_update_ctx *ctx;
 
@@ -3271,7 +3273,7 @@ void rib_update_vrf(vrf_id_t vrf_id, rib_update_event_t event)
 }
 
 /* Schedule a RIB update event for all vrfs */
-void rib_update(rib_update_event_t event)
+void rib_update(enum rib_update_event event)
 {
 	struct rib_update_ctx *ctx;
 
@@ -3425,7 +3427,7 @@ unsigned long rib_score_proto(uint8_t proto, unsigned short instance)
 void rib_close_table(struct route_table *table)
 {
 	struct route_node *rn;
-	rib_table_info_t *info;
+	struct rib_table_info *info;
 	rib_dest_t *dest;
 
 	if (!table)