Merge pull request #12798 from donaldsharp/rib_match_multicast

[mirror_frr.git] / ospfd / ospf_neighbor.c

diff --git a/ospfd/ospf_neighbor.c b/ospfd/ospf_neighbor.c
index c59734b9f3140d586332c650103bd3967a6de244..8338c430772f2bec8ea248afd8501799faa7b621 100644 (file)
--- a/ospfd/ospf_neighbor.c
+++ b/ospfd/ospf_neighbor.c
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * OSPF Neighbor functions.
  * Copyright (C) 1999, 2000 Toshiaki Takada
- *
- * This file is part of GNU Zebra.
- *
- * GNU Zebra is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2, or (at your
- * option) any later version.
- *
- * GNU Zebra is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; see the file COPYING; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <zebra.h>
@@ -140,17 +125,17 @@ void ospf_nbr_free(struct ospf_neighbor *nbr)
        }
 
        /* Cancel all timers. */
-       OSPF_NSM_TIMER_OFF(nbr->t_inactivity);
-       OSPF_NSM_TIMER_OFF(nbr->t_db_desc);
-       OSPF_NSM_TIMER_OFF(nbr->t_ls_req);
-       OSPF_NSM_TIMER_OFF(nbr->t_ls_upd);
+       THREAD_OFF(nbr->t_inactivity);
+       THREAD_OFF(nbr->t_db_desc);
+       THREAD_OFF(nbr->t_ls_req);
+       THREAD_OFF(nbr->t_ls_upd);
 
        /* Cancel all events. */ /* Thread lookup cost would be negligible. */
        thread_cancel_event(master, nbr);
 
        bfd_sess_free(&nbr->bfd_session);
 
-       OSPF_NSM_TIMER_OFF(nbr->gr_helper_info.t_grace_timer);
+       THREAD_OFF(nbr->gr_helper_info.t_grace_timer);
 
        nbr->oi = NULL;
        XFREE(MTYPE_OSPF_NEIGHBOR, nbr);
@@ -456,7 +441,7 @@ static struct ospf_neighbor *ospf_nbr_add(struct ospf_interface *oi,
                                nbr->nbr_nbma = nbr_nbma;
 
                                if (nbr_nbma->t_poll)
-                                       OSPF_POLL_TIMER_OFF(nbr_nbma->t_poll);
+                                       THREAD_OFF(nbr_nbma->t_poll);
 
                                nbr->state_change = nbr_nbma->state_change + 1;
                        }