13 files changed, 16 insertions, 16 deletions

diff --git a/zebra/dpdk/zebra_dplane_dpdk.c b/zebra/dpdk/zebra_dplane_dpdk.c
index eed5e75b7..b13daa3a9 100644
--- a/zebra/dpdk/zebra_dplane_dpdk.c
+++ b/zebra/dpdk/zebra_dplane_dpdk.c
@@ -694,7 +694,7 @@ static int zd_dpdk_finish(struct zebra_dplane_provider *prov, bool early)
 }
 
 
-static int zd_dpdk_plugin_init(struct event_master *tm)
+static int zd_dpdk_plugin_init(struct event_loop *tm)
 {
 	int ret;
 
diff --git a/zebra/dplane_fpm_nl.c b/zebra/dplane_fpm_nl.c
index 54bbc9933..b3bf1197b 100644
--- a/zebra/dplane_fpm_nl.c
+++ b/zebra/dplane_fpm_nl.c
@@ -1585,7 +1585,7 @@ static int fpm_nl_process(struct zebra_dplane_provider *prov)
 	return 0;
 }
 
-static int fpm_nl_new(struct event_master *tm)
+static int fpm_nl_new(struct event_loop *tm)
 {
 	struct zebra_dplane_provider *prov = NULL;
 	int rv;
diff --git a/zebra/irdp_main.c b/zebra/irdp_main.c
index 1e520283f..19b749b56 100644
--- a/zebra/irdp_main.c
+++ b/zebra/irdp_main.c
@@ -316,7 +316,7 @@ static int irdp_finish(void)
 	return 0;
 }
 
-static int irdp_init(struct event_master *master)
+static int irdp_init(struct event_loop *master)
 {
 	irdp_if_init();
 
diff --git a/zebra/kernel_netlink.c b/zebra/kernel_netlink.c
index 9cd06c1a0..04d30577c 100644
--- a/zebra/kernel_netlink.c
+++ b/zebra/kernel_netlink.c
@@ -156,7 +156,7 @@ static const struct message rttype_str[] = {{RTN_UNSPEC, "none"},
 					    {RTN_XRESOLVE, "resolver"},
 					    {0}};
 
-extern struct event_master *master;
+extern struct event_loop *master;
 
 extern struct zebra_privs_t zserv_privs;
 
diff --git a/zebra/main.c b/zebra/main.c
index 827a0dd5e..391633c35 100644
--- a/zebra/main.c
+++ b/zebra/main.c
@@ -52,7 +52,7 @@
 pid_t pid;
 
 /* Pacify zclient.o in libfrr, which expects this variable. */
-struct event_master *master;
+struct event_loop *master;
 
 /* Route retain mode flag. */
 int retain_mode = 0;
diff --git a/zebra/sample_plugin.c b/zebra/sample_plugin.c
index 5892b949d..b5f7b8837 100644
--- a/zebra/sample_plugin.c
+++ b/zebra/sample_plugin.c
@@ -76,7 +76,7 @@ static int sample_process(struct zebra_dplane_provider *prov)
  * Init entry point called during zebra startup. This is registered during
  * module init.
  */
-static int init_sample_plugin(struct event_master *tm)
+static int init_sample_plugin(struct event_loop *tm)
 {
 	int ret;
 
diff --git a/zebra/zebra_dplane.c b/zebra/zebra_dplane.c
index 5682b08f0..fb1ebc682 100644
--- a/zebra/zebra_dplane.c
+++ b/zebra/zebra_dplane.c
@@ -582,7 +582,7 @@ static struct zebra_dplane_globals {
 	struct frr_pthread *dg_pthread;
 
 	/* Event-delivery context 'master' for the dplane */
-	struct event_master *dg_master;
+	struct event_loop *dg_master;
 
 	/* Event/'thread' pointer for queued updates */
 	struct event *dg_t_update;
@@ -633,7 +633,7 @@ neigh_update_internal(enum dplane_op_e op, const struct interface *ifp,
  */
 
 /* Obtain thread_master for dataplane thread */
-struct event_master *dplane_get_thread_master(void)
+struct event_loop *dplane_get_thread_master(void)
 {
 	return zdplane_info.dg_master;
 }
diff --git a/zebra/zebra_dplane.h b/zebra/zebra_dplane.h
index 05d42a217..6716c0ffb 100644
--- a/zebra/zebra_dplane.h
+++ b/zebra/zebra_dplane.h
@@ -1006,7 +1006,7 @@ void dplane_provider_lock(struct zebra_dplane_provider *prov);
 void dplane_provider_unlock(struct zebra_dplane_provider *prov);
 
 /* Obtain thread_master for dataplane thread */
-struct event_master *dplane_get_thread_master(void);
+struct event_loop *dplane_get_thread_master(void);
 
 /* Providers should (generally) limit number of updates per work cycle */
 int dplane_provider_get_work_limit(const struct zebra_dplane_provider *prov);
diff --git a/zebra/zebra_fpm.c b/zebra/zebra_fpm.c
index 0842b4431..5b4e493e4 100644
--- a/zebra/zebra_fpm.c
+++ b/zebra/zebra_fpm.c
@@ -156,7 +156,7 @@ struct zfpm_glob {
 	 */
 	enum zfpm_msg_format message_format;
 
-	struct event_master *master;
+	struct event_loop *master;
 
 	enum zfpm_state state;
 
@@ -1978,7 +1978,7 @@ static struct cmd_node zebra_node = {
  *
  * Returns true on success.
  */
-static int zfpm_init(struct event_master *master)
+static int zfpm_init(struct event_loop *master)
 {
 	int enable = 1;
 	uint16_t port = 0;
diff --git a/zebra/zebra_mlag_private.c b/zebra/zebra_mlag_private.c
index 62870119f..d85097f2a 100644
--- a/zebra/zebra_mlag_private.c
+++ b/zebra/zebra_mlag_private.c
@@ -32,7 +32,7 @@
  *
  */
 
-static struct event_master *zmlag_master;
+static struct event_loop *zmlag_master;
 static int mlag_socket;
 
 static void zebra_mlag_connect(struct event *thread);
diff --git a/zebra/zebra_opaque.c b/zebra/zebra_opaque.c
index b2a5415c4..8ceb1f8dc 100644
--- a/zebra/zebra_opaque.c
+++ b/zebra/zebra_opaque.c
@@ -77,7 +77,7 @@ static struct zebra_opaque_globals {
 	struct frr_pthread *pthread;
 
 	/* Event-delivery context 'master' for the module */
-	struct event_master *master;
+	struct event_loop *master;
 
 	/* Event/'thread' pointer for queued zapi messages */
 	struct event *t_msgs;
diff --git a/zebra/zebra_router.h b/zebra/zebra_router.h
index 2179178a9..d81c7df58 100644
--- a/zebra/zebra_router.h
+++ b/zebra/zebra_router.h
@@ -110,7 +110,7 @@ struct zebra_mlag_info {
 	struct frr_pthread *zebra_pth_mlag;
 
 	/* MLAG Thread context 'master' */
-	struct event_master *th_master;
+	struct event_loop *th_master;
 
 	/*
 	 * Event for Initial MLAG Connection setup & Data Read
@@ -127,7 +127,7 @@ struct zebra_router {
 	atomic_bool in_shutdown;
 
 	/* Thread master */
-	struct event_master *master;
+	struct event_loop *master;
 
 	/* Lists of clients who have connected to us */
 	struct list *client_list;
diff --git a/zebra/zebra_snmp.c b/zebra/zebra_snmp.c
index 07b7d77bd..e06733cb8 100644
--- a/zebra/zebra_snmp.c
+++ b/zebra/zebra_snmp.c
@@ -536,7 +536,7 @@ static uint8_t *ipCidrTable(struct variable *v, oid objid[], size_t *objid_len,
 	return NULL;
 }
 
-static int zebra_snmp_init(struct event_master *tm)
+static int zebra_snmp_init(struct event_loop *tm)
 {
 	smux_init(tm);
 	REGISTER_MIB("mibII/ipforward", zebra_variables, variable, ipfw_oid);