Merge pull request #12798 from donaldsharp/rib_match_multicast

[mirror_frr.git] / eigrpd / eigrp_hello.c

diff --git a/eigrpd/eigrp_hello.c b/eigrpd/eigrp_hello.c
index e3680b31a33ffd745abd935b29eb2c4b05a49ac0..f62f54b680671f7e65bc9f8e900d6097a241b4e1 100644 (file)
--- a/eigrpd/eigrp_hello.c
+++ b/eigrpd/eigrp_hello.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * EIGRP Sending and Receiving EIGRP Hello Packets.
  * Copyright (C) 2013-2016
@@ -11,22 +12,6 @@
  *   Tomas Hvorkovy
  *   Martin Kontsek
  *   Lukas Koribsky
- *
- * 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>
@@ -74,19 +59,18 @@ static const struct message eigrp_general_tlv_type_str[] = {
  *
  * @param[in]   thread  current execution thread timer is associated with
  *
- * @return int  always returns 0
+ * @return void
  *
  * @par
  * Called once per "hello" time interval, default 5 seconds
  * Sends hello packet via multicast for all interfaces eigrp
  * is configured for
  */
-int eigrp_hello_timer(struct thread *thread)
+void eigrp_hello_timer(struct thread *thread)
 {
        struct eigrp_interface *ei;
 
        ei = THREAD_ARG(thread);
-       ei->t_hello = NULL;
 
        if (IS_DEBUG_EIGRP(0, TIMERS))
                zlog_debug("Start Hello Timer (%s) Expire [%u]", IF_NAME(ei),
@@ -96,11 +80,8 @@ int eigrp_hello_timer(struct thread *thread)
        eigrp_hello_send(ei, EIGRP_HELLO_NORMAL, NULL);
 
        /* Hello timer set. */
-       ei->t_hello = NULL;
        thread_add_timer(master, eigrp_hello_timer, ei, ei->params.v_hello,
                         &ei->t_hello);
-
-       return 0;
 }
 
 /**