4 files changed, 15 insertions, 15 deletions

diff --git a/bfdd/bfd.c b/bfdd/bfd.c
index 12ba16bc8..afd5d814a 100644
--- a/bfdd/bfd.c
+++ b/bfdd/bfd.c
@@ -1294,7 +1294,7 @@ static void _shop_key(struct bfd_session *bs, const struct bfd_shop_key *shop);
 static void _shop_key2(struct bfd_session *bs, const struct bfd_shop_key *shop);
 static void _mhop_key(struct bfd_session *bs, const struct bfd_mhop_key *mhop);
 
-static void _bfd_free(struct hash_backet *hb,
+static void _bfd_free(struct hash_bucket *hb,
 		      void *arg __attribute__((__unused__)));
 
 /* BFD hash for our discriminator. */
@@ -1516,7 +1516,7 @@ void bfd_initialize(void)
 				    "BFD multihop hop hash");
 }
 
-static void _bfd_free(struct hash_backet *hb,
+static void _bfd_free(struct hash_bucket *hb,
 		      void *arg __attribute__((__unused__)))
 {
 	struct bfd_session *bs = hb->data;
diff --git a/bfdd/bfd.h b/bfdd/bfd.h
index a65c47c06..7451ca82a 100644
--- a/bfdd/bfd.h
+++ b/bfdd/bfd.h
@@ -557,7 +557,7 @@ bool bfd_mhop_insert(struct bfd_session *bs);
 bool bfd_vrf_insert(struct bfd_vrf *vrf);
 bool bfd_iface_insert(struct bfd_iface *iface);
 
-typedef void (*hash_iter_func)(struct hash_backet *hb, void *arg);
+typedef void (*hash_iter_func)(struct hash_bucket *hb, void *arg);
 void bfd_id_iterate(hash_iter_func hif, void *arg);
 void bfd_shop_iterate(hash_iter_func hif, void *arg);
 void bfd_mhop_iterate(hash_iter_func hif, void *arg);
diff --git a/bfdd/bfdd_vty.c b/bfdd/bfdd_vty.c
index 6bdfc384e..0041f9cc2 100644
--- a/bfdd/bfdd_vty.c
+++ b/bfdd/bfdd_vty.c
@@ -52,7 +52,7 @@
 static int bfdd_write_config(struct vty *vty);
 static int bfdd_peer_write_config(struct vty *vty);
 static void _bfdd_peer_write_config(struct vty *vty, struct bfd_session *bs);
-static void _bfdd_peer_write_config_iter(struct hash_backet *hb, void *arg);
+static void _bfdd_peer_write_config_iter(struct hash_bucket *hb, void *arg);
 static int bfd_configure_peer(struct bfd_peer_cfg *bpc, bool mhop,
 			      const struct sockaddr_any *peer,
 			      const struct sockaddr_any *local,
@@ -65,13 +65,13 @@ static struct json_object *_peer_json_header(struct bfd_session *bs);
 static void _display_peer_json(struct vty *vty, struct bfd_session *bs);
 static void _display_peer(struct vty *vty, struct bfd_session *bs);
 static void _display_all_peers(struct vty *vty, bool use_json);
-static void _display_peer_iter(struct hash_backet *hb, void *arg);
-static void _display_peer_json_iter(struct hash_backet *hb, void *arg);
+static void _display_peer_iter(struct hash_bucket *hb, void *arg);
+static void _display_peer_json_iter(struct hash_bucket *hb, void *arg);
 static void _display_peer_counter(struct vty *vty, struct bfd_session *bs);
 static struct json_object *__display_peer_counters_json(struct bfd_session *bs);
 static void _display_peer_counters_json(struct vty *vty, struct bfd_session *bs);
-static void _display_peer_counter_iter(struct hash_backet *hb, void *arg);
-static void _display_peer_counter_json_iter(struct hash_backet *hb, void *arg);
+static void _display_peer_counter_iter(struct hash_bucket *hb, void *arg);
+static void _display_peer_counter_json_iter(struct hash_bucket *hb, void *arg);
 static void _display_peers_counter(struct vty *vty, bool use_json);
 static struct bfd_session *
 _find_peer_or_error(struct vty *vty, int argc, struct cmd_token **argv,
@@ -538,7 +538,7 @@ static void _display_peer_json(struct vty *vty, struct bfd_session *bs)
 	json_object_free(jo);
 }
 
-static void _display_peer_iter(struct hash_backet *hb, void *arg)
+static void _display_peer_iter(struct hash_bucket *hb, void *arg)
 {
 	struct vty *vty = arg;
 	struct bfd_session *bs = hb->data;
@@ -546,7 +546,7 @@ static void _display_peer_iter(struct hash_backet *hb, void *arg)
 	_display_peer(vty, bs);
 }
 
-static void _display_peer_json_iter(struct hash_backet *hb, void *arg)
+static void _display_peer_json_iter(struct hash_bucket *hb, void *arg)
 {
 	struct json_object *jo = arg, *jon = NULL;
 	struct bfd_session *bs = hb->data;
@@ -621,7 +621,7 @@ static void _display_peer_counters_json(struct vty *vty, struct bfd_session *bs)
 	json_object_free(jo);
 }
 
-static void _display_peer_counter_iter(struct hash_backet *hb, void *arg)
+static void _display_peer_counter_iter(struct hash_bucket *hb, void *arg)
 {
 	struct vty *vty = arg;
 	struct bfd_session *bs = hb->data;
@@ -629,7 +629,7 @@ static void _display_peer_counter_iter(struct hash_backet *hb, void *arg)
 	_display_peer_counter(vty, bs);
 }
 
-static void _display_peer_counter_json_iter(struct hash_backet *hb, void *arg)
+static void _display_peer_counter_json_iter(struct hash_bucket *hb, void *arg)
 {
 	struct json_object *jo = arg, *jon = NULL;
 	struct bfd_session *bs = hb->data;
@@ -970,7 +970,7 @@ DEFUN_NOSH(show_debugging_bfd,
 	return CMD_SUCCESS;
 }
 
-static void _bfdd_peer_write_config_iter(struct hash_backet *hb, void *arg)
+static void _bfdd_peer_write_config_iter(struct hash_bucket *hb, void *arg)
 {
 	struct vty *vty = arg;
 	struct bfd_session *bs = hb->data;
diff --git a/bfdd/control.c b/bfdd/control.c
index 554a5a8d8..40f4f4d3b 100644
--- a/bfdd/control.c
+++ b/bfdd/control.c
@@ -65,7 +65,7 @@ static void control_handle_notify_add(struct bfd_control_socket *bcs,
 				      struct bfd_control_msg *bcm);
 static void control_handle_notify_del(struct bfd_control_socket *bcs,
 				      struct bfd_control_msg *bcm);
-static void _control_handle_notify(struct hash_backet *hb, void *arg);
+static void _control_handle_notify(struct hash_bucket *hb, void *arg);
 static void control_handle_notify(struct bfd_control_socket *bcs,
 				  struct bfd_control_msg *bcm);
 static void control_response(struct bfd_control_socket *bcs, uint16_t id,
@@ -630,7 +630,7 @@ static struct bfd_session *_notify_find_peer(struct bfd_peer_cfg *bpc)
 	return bs_peer_find(bpc);
 }
 
-static void _control_handle_notify(struct hash_backet *hb, void *arg)
+static void _control_handle_notify(struct hash_bucket *hb, void *arg)
 {
 	struct bfd_control_socket *bcs = arg;
 	struct bfd_session *bs = hb->data;