Revert "*: change hash_backet to hash_bucket"

This reverts commit 3895c42a2eb534a70ef25412547e798c1c1ef5a1.

LabN CI update needs to be coordinated before merging this

Signed-off-by: Jafar Al-Gharaibeh <jafar@atcorp.com>

12 files changed, 25 insertions, 20 deletions

diff --git a/bfdd/bfdd_vty.c b/bfdd/bfdd_vty.c
index 3b795748c0..e6307f78a4 100644
--- a/bfdd/bfdd_vty.c
+++ b/bfdd/bfdd_vty.c
@@ -474,7 +474,7 @@ static void _display_peer_brief(struct vty *vty, struct bfd_session *bs)
 	}
 }
 
-static void _display_peer_brief_iter(struct hash_bucket *hb, void *arg)
+static void _display_peer_brief_iter(struct hash_backet *hb, void *arg)
 {
 	struct bfd_vrf_tuple *bvt = arg;
 	struct vty *vty;
diff --git a/bgpd/bgp_aspath.c b/bgpd/bgp_aspath.c
index 2f54d53488..a781e70d2f 100644
--- a/bgpd/bgp_aspath.c
+++ b/bgpd/bgp_aspath.c
@@ -2127,7 +2127,7 @@ static void *bgp_aggr_aspath_hash_alloc(void *p)
 	return aspath;
 }
 
-static void bgp_aggr_aspath_prepare(struct hash_bucket *hb, void *arg)
+static void bgp_aggr_aspath_prepare(struct hash_backet *hb, void *arg)
 {
 	struct aspath *hb_aspath = hb->data;
 	struct aspath **aggr_aspath = arg;
diff --git a/bgpd/bgp_community.c b/bgpd/bgp_community.c
index c145c47d02..496d7ed2b1 100644
--- a/bgpd/bgp_community.c
+++ b/bgpd/bgp_community.c
@@ -907,7 +907,7 @@ static void *bgp_aggr_communty_hash_alloc(void *p)
 	return community;
 }
 
-static void bgp_aggr_community_prepare(struct hash_bucket *hb, void *arg)
+static void bgp_aggr_community_prepare(struct hash_backet *hb, void *arg)
 {
 	struct community *hb_community = hb->data;
 	struct community **aggr_community = arg;
diff --git a/bgpd/bgp_ecommunity.c b/bgpd/bgp_ecommunity.c
index 2711cf7a69..4c55a0764d 100644
--- a/bgpd/bgp_ecommunity.c
+++ b/bgpd/bgp_ecommunity.c
@@ -1026,7 +1026,7 @@ static void *bgp_aggr_ecommunty_hash_alloc(void *p)
 	return ecommunity;
 }
 
-static void bgp_aggr_ecommunity_prepare(struct hash_bucket *hb, void *arg)
+static void bgp_aggr_ecommunity_prepare(struct hash_backet *hb, void *arg)
 {
 	struct ecommunity *hb_ecommunity = hb->data;
 	struct ecommunity **aggr_ecommunity = arg;
diff --git a/bgpd/bgp_lcommunity.c b/bgpd/bgp_lcommunity.c
index 7a4435f6f2..f889693001 100644
--- a/bgpd/bgp_lcommunity.c
+++ b/bgpd/bgp_lcommunity.c
@@ -550,7 +550,7 @@ static void *bgp_aggr_lcommunty_hash_alloc(void *p)
 	return lcommunity;
 }
 
-static void bgp_aggr_lcommunity_prepare(struct hash_bucket *hb, void *arg)
+static void bgp_aggr_lcommunity_prepare(struct hash_backet *hb, void *arg)
 {
 	struct lcommunity *hb_lcommunity = hb->data;
 	struct lcommunity **aggr_lcommunity = arg;
diff --git a/lib/hash.h b/lib/hash.h
index e7ba3187f5..7b3372d433 100644
--- a/lib/hash.h
+++ b/lib/hash.h
@@ -36,6 +36,11 @@ extern "C" {
 #define HASHWALK_CONTINUE 0
 #define HASHWALK_ABORT -1
 
+#if CONFDATE > 20200225
+CPP_NOTICE("hash.h: time to remove hash_backet #define")
+#endif
+#define hash_backet hash_bucket
+
 struct hash_bucket {
 	/*
 	 * if this bucket is the head of the linked listed, len denotes the
diff --git a/lib/routemap.c b/lib/routemap.c
index 64677e8863..54b5383173 100644
--- a/lib/routemap.c
+++ b/lib/routemap.c
@@ -2257,7 +2257,7 @@ static void route_map_pentry_update(route_map_event_t event,
 	}
 }
 
-static void route_map_pentry_process_dependency(struct hash_bucket *backet,
+static void route_map_pentry_process_dependency(struct hash_backet *backet,
 						void *data)
 {
 	char *rmap_name = NULL;
diff --git a/pbrd/pbr_nht.c b/pbrd/pbr_nht.c
index adcb86833a..5ab714e617 100644
--- a/pbrd/pbr_nht.c
+++ b/pbrd/pbr_nht.c
@@ -853,7 +853,7 @@ void pbr_nht_nexthop_update(struct zapi_route *nhr)
 }
 
 static void
-pbr_nht_individual_nexthop_interface_update_lookup(struct hash_bucket *b,
+pbr_nht_individual_nexthop_interface_update_lookup(struct hash_backet *b,
 						   void *data)
 {
 	struct pbr_nexthop_cache *pnhc = b->data;
@@ -871,7 +871,7 @@ pbr_nht_individual_nexthop_interface_update_lookup(struct hash_bucket *b,
 		pnhi->valid += 1;
 }
 
-static void pbr_nht_nexthop_interface_update_lookup(struct hash_bucket *b,
+static void pbr_nht_nexthop_interface_update_lookup(struct hash_backet *b,
 						    void *data)
 {
 	struct pbr_nexthop_group_cache *pnhgc = b->data;
diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index fed256323f..0caf8e4f78 100644
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -10397,7 +10397,7 @@ static void pim_show_vxlan_sg_entry(struct pim_vxlan_sg *vxlan_sg,
 	}
 }
 
-static void pim_show_vxlan_sg_hash_entry(struct hash_bucket *backet, void *arg)
+static void pim_show_vxlan_sg_hash_entry(struct hash_backet *backet, void *arg)
 {
 	pim_show_vxlan_sg_entry((struct pim_vxlan_sg *)backet->data,
 		 (struct pim_sg_cache_walk_data *)arg);
diff --git a/pimd/pim_vxlan.c b/pimd/pim_vxlan.c
index b7cbfa95aa..57b922a531 100644
--- a/pimd/pim_vxlan.c
+++ b/pimd/pim_vxlan.c
@@ -475,7 +475,7 @@ static void pim_vxlan_orig_mr_del(struct pim_vxlan_sg *vxlan_sg)
 	pim_vxlan_orig_mr_up_del(vxlan_sg);
 }
 
-static void pim_vxlan_orig_mr_iif_update(struct hash_bucket *backet, void *arg)
+static void pim_vxlan_orig_mr_iif_update(struct hash_backet *backet, void *arg)
 {
 	struct interface *ifp;
 	struct pim_vxlan_sg *vxlan_sg = (struct pim_vxlan_sg *)backet->data;
@@ -788,7 +788,7 @@ bool pim_vxlan_do_mlag_reg(void)
  * to the MLAG peer which may mroute it over the underlay if there are any
  * interested receivers.
  */
-static void pim_vxlan_sg_peerlink_oif_update(struct hash_bucket *backet,
+static void pim_vxlan_sg_peerlink_oif_update(struct hash_backet *backet,
 		void *arg)
 {
 	struct interface *new_oif = (struct interface *)arg;
@@ -927,7 +927,7 @@ static void pim_vxlan_up_cost_update(struct pim_instance *pim,
 	}
 }
 
-static void pim_vxlan_term_mr_cost_update(struct hash_bucket *backet,
+static void pim_vxlan_term_mr_cost_update(struct hash_backet *backet,
 		void *arg)
 {
 	struct interface *old_peerlink_rif = (struct interface *)arg;
@@ -953,7 +953,7 @@ static void pim_vxlan_term_mr_cost_update(struct hash_bucket *backet,
 				old_peerlink_rif);
 }
 
-static void pim_vxlan_sg_peerlink_rif_update(struct hash_bucket *backet,
+static void pim_vxlan_sg_peerlink_rif_update(struct hash_backet *backet,
 		void *arg)
 {
 	pim_vxlan_orig_mr_iif_update(backet, NULL);
@@ -1012,7 +1012,7 @@ static void pim_vxlan_set_peerlink_rif(struct pim_instance *pim,
 	}
 }
 
-static void pim_vxlan_term_mr_oif_update(struct hash_bucket *backet, void *arg)
+static void pim_vxlan_term_mr_oif_update(struct hash_backet *backet, void *arg)
 {
 	struct interface *ifp = (struct interface *)arg;
 	struct pim_vxlan_sg *vxlan_sg = (struct pim_vxlan_sg *)backet->data;
diff --git a/zebra/zebra_fpm.c b/zebra/zebra_fpm.c
index 0190ee2b8d..fa48c03c71 100644
--- a/zebra/zebra_fpm.c
+++ b/zebra/zebra_fpm.c
@@ -70,7 +70,7 @@ DEFINE_MTYPE_STATIC(ZEBRA, FPM_MAC_INFO, "FPM_MAC_INFO");
 #define ZFPM_STATS_IVL_SECS        10
 #define FPM_MAX_MAC_MSG_LEN 512
 
-static void zfpm_iterate_rmac_table(struct hash_bucket *backet, void *args);
+static void zfpm_iterate_rmac_table(struct hash_backet *backet, void *args);
 
 /*
  * Structure that holds state for iterating over all route_node
@@ -1647,7 +1647,7 @@ static int zfpm_trigger_rmac_update(zebra_mac_t *rmac, zebra_l3vni_t *zl3vni,
  * Iterate over all the RMAC entries for the given L3VNI
  * and enqueue the RMAC for FPM processing.
  */
-static void zfpm_trigger_rmac_update_wrapper(struct hash_bucket *backet,
+static void zfpm_trigger_rmac_update_wrapper(struct hash_backet *backet,
 					     void *args)
 {
 	zebra_mac_t *zrmac = (zebra_mac_t *)backet->data;
@@ -1661,7 +1661,7 @@ static void zfpm_trigger_rmac_update_wrapper(struct hash_bucket *backet,
  * This function iterates over all the L3VNIs to trigger
  * FPM updates for RMACs currently available.
  */
-static void zfpm_iterate_rmac_table(struct hash_bucket *backet, void *args)
+static void zfpm_iterate_rmac_table(struct hash_backet *backet, void *args)
 {
 	zebra_l3vni_t *zl3vni = (zebra_l3vni_t *)backet->data;
 
diff --git a/zebra/zebra_vxlan.c b/zebra/zebra_vxlan.c
index 04c9cde598..4b56581ca9 100644
--- a/zebra/zebra_vxlan.c
+++ b/zebra/zebra_vxlan.c
@@ -225,7 +225,7 @@ static void zebra_vxlan_sg_deref(struct in_addr local_vtep_ip,
 				struct in_addr mcast_grp);
 static void zebra_vxlan_sg_ref(struct in_addr local_vtep_ip,
 				struct in_addr mcast_grp);
-static void zebra_vxlan_sg_cleanup(struct hash_bucket *bucket, void *arg);
+static void zebra_vxlan_sg_cleanup(struct hash_backet *backet, void *arg);
 
 static void zvni_send_mac_to_client(zebra_vni_t *zvn);
 static void zvni_send_neigh_to_client(zebra_vni_t *zvni);
@@ -10102,14 +10102,14 @@ static void zebra_vxlan_sg_ref(struct in_addr local_vtep_ip,
 	zebra_vxlan_sg_do_ref(zvrf, local_vtep_ip, mcast_grp);
 }
 
-static void zebra_vxlan_sg_cleanup(struct hash_bucket *backet, void *arg)
+static void zebra_vxlan_sg_cleanup(struct hash_backet *backet, void *arg)
 {
 	zebra_vxlan_sg_t *vxlan_sg = (zebra_vxlan_sg_t *)backet->data;
 
 	zebra_vxlan_sg_del(vxlan_sg);
 }
 
-static void zebra_vxlan_sg_replay_send(struct hash_bucket *backet, void *arg)
+static void zebra_vxlan_sg_replay_send(struct hash_backet *backet, void *arg)
 {
 	zebra_vxlan_sg_t *vxlan_sg = (zebra_vxlan_sg_t *)backet->data;