diff options
Diffstat (limited to 'ospf6d/ospf6_intra.c')
| -rw-r--r-- | ospf6d/ospf6_intra.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/ospf6d/ospf6_intra.c b/ospf6d/ospf6_intra.c index e7ce2f5f72..301fccecd7 100644 --- a/ospf6d/ospf6_intra.c +++ b/ospf6d/ospf6_intra.c @@ -7,7 +7,7 @@ #include "log.h" #include "linklist.h" -#include "thread.h" +#include "frrevent.h" #include "memory.h" #include "if.h" #include "prefix.h" @@ -209,7 +209,7 @@ int ospf6_router_is_stub_router(struct ospf6_lsa *lsa) return OSPF6_NOT_STUB_ROUTER; } -void ospf6_router_lsa_originate(struct thread *thread) +void ospf6_router_lsa_originate(struct event *thread) { struct ospf6_area *oa; @@ -228,7 +228,7 @@ void ospf6_router_lsa_originate(struct thread *thread) uint32_t router; int count; - oa = (struct ospf6_area *)THREAD_ARG(thread); + oa = (struct ospf6_area *)EVENT_ARG(thread); if (oa->ospf6->gr_info.restart_in_progress) { if (IS_DEBUG_OSPF6_GR) @@ -494,7 +494,7 @@ static int ospf6_network_lsa_show(struct vty *vty, struct ospf6_lsa *lsa, return 0; } -void ospf6_network_lsa_originate(struct thread *thread) +void ospf6_network_lsa_originate(struct event *thread) { struct ospf6_interface *oi; @@ -510,7 +510,7 @@ void ospf6_network_lsa_originate(struct thread *thread) struct listnode *i; uint16_t type; - oi = (struct ospf6_interface *)THREAD_ARG(thread); + oi = (struct ospf6_interface *)EVENT_ARG(thread); /* The interface must be enabled until here. A Network-LSA of a disabled interface (but was once enabled) should be flushed @@ -746,7 +746,7 @@ static int ospf6_link_lsa_show(struct vty *vty, struct ospf6_lsa *lsa, return 0; } -void ospf6_link_lsa_originate(struct thread *thread) +void ospf6_link_lsa_originate(struct event *thread) { struct ospf6_interface *oi; @@ -758,7 +758,7 @@ void ospf6_link_lsa_originate(struct thread *thread) struct ospf6_route *route; struct ospf6_prefix *op; - oi = (struct ospf6_interface *)THREAD_ARG(thread); + oi = (struct ospf6_interface *)EVENT_ARG(thread); assert(oi->area); @@ -982,7 +982,7 @@ static int ospf6_intra_prefix_lsa_show(struct vty *vty, struct ospf6_lsa *lsa, return 0; } -void ospf6_intra_prefix_lsa_originate_stub(struct thread *thread) +void ospf6_intra_prefix_lsa_originate_stub(struct event *thread) { struct ospf6_area *oa; @@ -1001,7 +1001,7 @@ void ospf6_intra_prefix_lsa_originate_stub(struct thread *thread) struct ospf6_route_table *route_advertise; int ls_id = 0; - oa = (struct ospf6_area *)THREAD_ARG(thread); + oa = (struct ospf6_area *)EVENT_ARG(thread); if (oa->ospf6->gr_info.restart_in_progress) { if (IS_DEBUG_OSPF6_GR) @@ -1217,7 +1217,7 @@ void ospf6_intra_prefix_lsa_originate_stub(struct thread *thread) } -void ospf6_intra_prefix_lsa_originate_transit(struct thread *thread) +void ospf6_intra_prefix_lsa_originate_transit(struct event *thread) { struct ospf6_interface *oi; @@ -1237,7 +1237,7 @@ void ospf6_intra_prefix_lsa_originate_transit(struct thread *thread) char *start, *end, *current; uint16_t type; - oi = (struct ospf6_interface *)THREAD_ARG(thread); + oi = (struct ospf6_interface *)EVENT_ARG(thread); assert(oi->area); |