diff options
| author | Donald Sharp <sharpd@nvidia.com> | 2022-06-03 10:28:11 -0400 |
|---|---|---|
| committer | Donald Sharp <sharpd@nvidia.com> | 2022-07-21 08:27:35 -0400 |
| commit | cccd44f3b1ae4f6e16c9183c5222ba767340d1f7 (patch) | |
| tree | cdd63cd1e85f5cdbde2efce31827de9c4980f665 /ospfd/ospf_ism.c | |
| parent | 87af90a765b697a944e4309a4b89c0a44b958435 (diff) | |
ospfd: Remove various macros that overlap THREAD_OFF
Let's just use THREAD_OFF consistently in the code base
instead of each daemon having a special macro that needs to
be looked at and remembered what it does.
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Diffstat (limited to 'ospfd/ospf_ism.c')
| -rw-r--r-- | ospfd/ospf_ism.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/ospfd/ospf_ism.c b/ospfd/ospf_ism.c index 97da61034f..ab75ab9a1a 100644 --- a/ospfd/ospf_ism.c +++ b/ospfd/ospf_ism.c @@ -290,16 +290,16 @@ static void ism_timer_set(struct ospf_interface *oi) interface parameters must be set to initial values, and timers are reset also. */ - OSPF_ISM_TIMER_OFF(oi->t_hello); - OSPF_ISM_TIMER_OFF(oi->t_wait); - OSPF_ISM_TIMER_OFF(oi->t_ls_ack); + THREAD_OFF(oi->t_hello); + THREAD_OFF(oi->t_wait); + THREAD_OFF(oi->t_ls_ack); break; case ISM_Loopback: /* In this state, the interface may be looped back and will be unavailable for regular data traffic. */ - OSPF_ISM_TIMER_OFF(oi->t_hello); - OSPF_ISM_TIMER_OFF(oi->t_wait); - OSPF_ISM_TIMER_OFF(oi->t_ls_ack); + THREAD_OFF(oi->t_hello); + THREAD_OFF(oi->t_wait); + THREAD_OFF(oi->t_ls_ack); break; case ISM_Waiting: /* The router is trying to determine the identity of DRouter and @@ -309,7 +309,7 @@ static void ism_timer_set(struct ospf_interface *oi) OSPF_ISM_TIMER_MSEC_ON(oi->t_hello, ospf_hello_timer, 1); OSPF_ISM_TIMER_ON(oi->t_wait, ospf_wait_timer, OSPF_IF_PARAM(oi, v_wait)); - OSPF_ISM_TIMER_OFF(oi->t_ls_ack); + THREAD_OFF(oi->t_ls_ack); break; case ISM_PointToPoint: /* The interface connects to a physical Point-to-point network @@ -318,7 +318,7 @@ static void ism_timer_set(struct ospf_interface *oi) neighboring router. Hello packets are also sent. */ /* send first hello immediately */ OSPF_ISM_TIMER_MSEC_ON(oi->t_hello, ospf_hello_timer, 1); - OSPF_ISM_TIMER_OFF(oi->t_wait); + THREAD_OFF(oi->t_wait); OSPF_ISM_TIMER_ON(oi->t_ls_ack, ospf_ls_ack_timer, oi->v_ls_ack); break; @@ -328,7 +328,7 @@ static void ism_timer_set(struct ospf_interface *oi) and the router itself is neither Designated Router nor Backup Designated Router. */ OSPF_HELLO_TIMER_ON(oi); - OSPF_ISM_TIMER_OFF(oi->t_wait); + THREAD_OFF(oi->t_wait); OSPF_ISM_TIMER_ON(oi->t_ls_ack, ospf_ls_ack_timer, oi->v_ls_ack); break; @@ -337,7 +337,7 @@ static void ism_timer_set(struct ospf_interface *oi) network, and the router is Backup Designated Router. */ OSPF_HELLO_TIMER_ON(oi); - OSPF_ISM_TIMER_OFF(oi->t_wait); + THREAD_OFF(oi->t_wait); OSPF_ISM_TIMER_ON(oi->t_ls_ack, ospf_ls_ack_timer, oi->v_ls_ack); break; @@ -346,7 +346,7 @@ static void ism_timer_set(struct ospf_interface *oi) network, and the router is Designated Router. */ OSPF_HELLO_TIMER_ON(oi); - OSPF_ISM_TIMER_OFF(oi->t_wait); + THREAD_OFF(oi->t_wait); OSPF_ISM_TIMER_ON(oi->t_ls_ack, ospf_ls_ack_timer, oi->v_ls_ack); break; |