*: Convert thread_execute to event_execute

Signed-off-by: Donald Sharp <sharpd@nvidia.com>

6 files changed, 30 insertions, 30 deletions

diff --git a/ospf6d/ospf6_interface.c b/ospf6d/ospf6_interface.c
index 7828f35d54..2c8d168e09 100644
--- a/ospf6d/ospf6_interface.c
+++ b/ospf6d/ospf6_interface.c
@@ -307,7 +307,7 @@ void ospf6_interface_disable(struct ospf6_interface *oi)
 {
 	SET_FLAG(oi->flag, OSPF6_INTERFACE_DISABLE);
 
-	thread_execute(master, interface_down, oi, 0);
+	event_execute(master, interface_down, oi, 0);
 
 	ospf6_lsdb_remove_all(oi->lsdb);
 	ospf6_lsdb_remove_all(oi->lsdb_self);
@@ -382,9 +382,9 @@ void ospf6_interface_state_update(struct interface *ifp)
 	if (if_is_operative(ifp)
 	    && (ospf6_interface_get_linklocal_address(oi->interface)
 		|| if_is_loopback(oi->interface)))
-		thread_execute(master, interface_up, oi, 0);
+		event_execute(master, interface_up, oi, 0);
 	else
-		thread_execute(master, interface_down, oi, 0);
+		event_execute(master, interface_down, oi, 0);
 
 	return;
 }
@@ -2520,8 +2520,8 @@ DEFUN (ipv6_ospf6_network,
 	}
 
 	/* Reset the interface */
-	thread_execute(master, interface_down, oi, 0);
-	thread_execute(master, interface_up, oi, 0);
+	event_execute(master, interface_down, oi, 0);
+	event_execute(master, interface_up, oi, 0);
 
 	return CMD_SUCCESS;
 }
@@ -2556,8 +2556,8 @@ DEFUN (no_ipv6_ospf6_network,
 	oi->type = type;
 
 	/* Reset the interface */
-	thread_execute(master, interface_down, oi, 0);
-	thread_execute(master, interface_up, oi, 0);
+	event_execute(master, interface_down, oi, 0);
+	event_execute(master, interface_up, oi, 0);
 
 	return CMD_SUCCESS;
 }
@@ -2773,8 +2773,8 @@ void ospf6_interface_clear(struct interface *ifp)
 		zlog_debug("Interface %s: clear by reset", ifp->name);
 
 	/* Reset the interface */
-	thread_execute(master, interface_down, oi, 0);
-	thread_execute(master, interface_up, oi, 0);
+	event_execute(master, interface_down, oi, 0);
+	event_execute(master, interface_up, oi, 0);
 }
 
 /* Clear interface */
diff --git a/ospf6d/ospf6_intra.h b/ospf6d/ospf6_intra.h
index b09c4163f9..62e877eb59 100644
--- a/ospf6d/ospf6_intra.h
+++ b/ospf6d/ospf6_intra.h
@@ -180,35 +180,35 @@ struct ospf6_intra_prefix_lsa {
 #define OSPF6_ROUTER_LSA_EXECUTE(oa)                                           \
 	do {                                                                   \
 		if (CHECK_FLAG((oa)->flag, OSPF6_AREA_ENABLE))                 \
-			thread_execute(master, ospf6_router_lsa_originate, oa, \
-				       0);                                     \
+			event_execute(master, ospf6_router_lsa_originate, oa,  \
+				      0);                                      \
 	} while (0)
 
 #define OSPF6_NETWORK_LSA_EXECUTE(oi)                                          \
 	do {                                                                   \
 		THREAD_OFF((oi)->thread_network_lsa);                          \
-		thread_execute(master, ospf6_network_lsa_originate, oi, 0);    \
+		event_execute(master, ospf6_network_lsa_originate, oi, 0);     \
 	} while (0)
 
 #define OSPF6_LINK_LSA_EXECUTE(oi)                                             \
 	do {                                                                   \
 		if (!CHECK_FLAG((oi)->flag, OSPF6_INTERFACE_DISABLE))          \
-			thread_execute(master, ospf6_link_lsa_originate, oi,   \
-				       0);                                     \
+			event_execute(master, ospf6_link_lsa_originate, oi,    \
+				      0);                                      \
 	} while (0)
 
 #define OSPF6_INTRA_PREFIX_LSA_EXECUTE_TRANSIT(oi)                             \
 	do {                                                                   \
 		THREAD_OFF((oi)->thread_intra_prefix_lsa);                     \
-		thread_execute(master,                                         \
-			       ospf6_intra_prefix_lsa_originate_transit, oi,   \
-			       0);                                             \
+		event_execute(master,                                          \
+			      ospf6_intra_prefix_lsa_originate_transit, oi,    \
+			      0);                                              \
 	} while (0)
 
 #define OSPF6_AS_EXTERN_LSA_EXECUTE(oi)                                        \
 	do {                                                                   \
 		THREAD_OFF((oi)->thread_as_extern_lsa);                        \
-		thread_execute(master, ospf6_orig_as_external_lsa, oi, 0);     \
+		event_execute(master, ospf6_orig_as_external_lsa, oi, 0);      \
 	} while (0)
 
 /* Function Prototypes */
diff --git a/ospf6d/ospf6_lsa.c b/ospf6d/ospf6_lsa.c
index a9dd7aa28c..be0cc34424 100644
--- a/ospf6d/ospf6_lsa.c
+++ b/ospf6d/ospf6_lsa.c
@@ -333,7 +333,7 @@ void ospf6_lsa_premature_aging(struct ospf6_lsa *lsa)
 	ospf6_flood_clear(lsa);
 
 	lsa->header->age = htons(OSPF_LSA_MAXAGE);
-	thread_execute(master, ospf6_lsa_expire, lsa, 0);
+	event_execute(master, ospf6_lsa_expire, lsa, 0);
 }
 
 /* check which is more recent. if a is more recent, return -1;
diff --git a/ospf6d/ospf6_lsdb.c b/ospf6d/ospf6_lsdb.c
index 586183731c..817949f019 100644
--- a/ospf6d/ospf6_lsdb.c
+++ b/ospf6d/ospf6_lsdb.c
@@ -396,7 +396,7 @@ int ospf6_lsdb_maxage_remover(struct ospf6_lsdb *lsdb)
 			ospf6_lsa_checksum(lsa->header);
 
 			THREAD_OFF(lsa->refresh);
-			thread_execute(master, ospf6_lsa_refresh, lsa, 0);
+			event_execute(master, ospf6_lsa_refresh, lsa, 0);
 		} else {
 			zlog_debug("calling ospf6_lsdb_remove %s", lsa->name);
 			ospf6_lsdb_remove(lsa, lsdb);
diff --git a/ospf6d/ospf6_message.c b/ospf6d/ospf6_message.c
index ff73958742..99c33faccf 100644
--- a/ospf6d/ospf6_message.c
+++ b/ospf6d/ospf6_message.c
@@ -535,9 +535,9 @@ static void ospf6_hello_recv(struct in6_addr *src, struct in6_addr *dst,
 	oi->hello_in++;
 
 	/* Execute neighbor events */
-	thread_execute(master, hello_received, on, 0);
+	event_execute(master, hello_received, on, 0);
 	if (twoway)
-		thread_execute(master, twoway_received, on, 0);
+		event_execute(master, twoway_received, on, 0);
 	else {
 		if (OSPF6_GR_IS_ACTIVE_HELPER(on)) {
 			if (IS_DEBUG_OSPF6_GR)
@@ -553,7 +553,7 @@ static void ospf6_hello_recv(struct in6_addr *src, struct in6_addr *dst,
 			 * receives one_way hellow when it acts as HELPER for
 			 * that specific neighbor.
 			 */
-			thread_execute(master, oneway_received, on, 0);
+			event_execute(master, oneway_received, on, 0);
 		}
 	}
 
@@ -624,7 +624,7 @@ static void ospf6_dbdesc_recv_master(struct ospf6_header *oh,
 		return;
 
 	case OSPF6_NEIGHBOR_INIT:
-		thread_execute(master, twoway_received, on, 0);
+		event_execute(master, twoway_received, on, 0);
 		if (on->state != OSPF6_NEIGHBOR_EXSTART) {
 			if (IS_OSPF6_DEBUG_MESSAGE(oh->type, RECV_HDR))
 				zlog_debug(
@@ -640,7 +640,7 @@ static void ospf6_dbdesc_recv_master(struct ospf6_header *oh,
 		    && !CHECK_FLAG(dbdesc->bits, OSPF6_DBDESC_IBIT)
 		    && ntohl(dbdesc->seqnum) == on->dbdesc_seqnum) {
 			/* execute NegotiationDone */
-			thread_execute(master, negotiation_done, on, 0);
+			event_execute(master, negotiation_done, on, 0);
 
 			/* Record neighbor options */
 			memcpy(on->options, dbdesc->options,
@@ -828,7 +828,7 @@ static void ospf6_dbdesc_recv_slave(struct ospf6_header *oh,
 		return;
 
 	case OSPF6_NEIGHBOR_INIT:
-		thread_execute(master, twoway_received, on, 0);
+		event_execute(master, twoway_received, on, 0);
 		if (on->state != OSPF6_NEIGHBOR_EXSTART) {
 			if (IS_OSPF6_DEBUG_MESSAGE(oh->type, RECV_HDR))
 				zlog_debug(
@@ -855,7 +855,7 @@ static void ospf6_dbdesc_recv_slave(struct ospf6_header *oh,
 			on->dbdesc_seqnum = ntohl(dbdesc->seqnum);
 
 			/* schedule NegotiationDone */
-			thread_execute(master, negotiation_done, on, 0);
+			event_execute(master, negotiation_done, on, 0);
 
 			/* Record neighbor options */
 			memcpy(on->options, dbdesc->options,
@@ -2421,7 +2421,7 @@ void ospf6_dbdesc_send_newone(struct event *thread)
 		event_add_event(master, exchange_done, on, 0,
 				&on->thread_exchange_done);
 
-	thread_execute(master, ospf6_dbdesc_send, on, 0);
+	event_execute(master, ospf6_dbdesc_send, on, 0);
 }
 
 static uint16_t ospf6_make_lsreq(struct ospf6_neighbor *on, struct stream *s)
@@ -2592,7 +2592,7 @@ static void ospf6_send_lsupdate(struct ospf6_neighbor *on,
 				listnode_add(oi->area->ospf6->oi_write_q, oi);
 				oi->on_write_q = 1;
 			}
-			thread_execute(master, ospf6_write, oi->area->ospf6, 0);
+			event_execute(master, ospf6_write, oi->area->ospf6, 0);
 		} else
 			OSPF6_MESSAGE_WRITE_ON(oi);
 	}
diff --git a/ospf6d/ospf6_nssa.c b/ospf6d/ospf6_nssa.c
index ca48b25d68..87754a59a8 100644
--- a/ospf6d/ospf6_nssa.c
+++ b/ospf6d/ospf6_nssa.c
@@ -1436,7 +1436,7 @@ DEFPY (no_area_nssa_range,
 		SET_FLAG(range->flag, OSPF6_ROUTE_REMOVE);
 
 		/* Redo summaries if required */
-		thread_execute(master, ospf6_abr_task_timer, ospf6, 0);
+		event_execute(master, ospf6_abr_task_timer, ospf6, 0);
 	}
 
 	ospf6_route_remove(range, oa->nssa_range_table);