Merge pull request #12798 from donaldsharp/rib_match_multicast

[mirror_frr.git] / ripngd / ripng_nexthop.c

diff --git a/ripngd/ripng_nexthop.c b/ripngd/ripng_nexthop.c
index 3e9fa90938c917e82543dc322a3b4f25b3f318de..38e7ce2519f0ecf6df2b3da4aa7591aced3ad712 100644 (file)
--- a/ripngd/ripng_nexthop.c
+++ b/ripngd/ripng_nexthop.c
@@ -1,21 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /* RIPngd Zebra
  * Copyright (C) 2002 6WIND <vincent.jardin@6wind.com>
- *
- * 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
  */
 
 /* This file is required in order to support properly the RIPng nexthop
@@ -43,8 +28,6 @@ DEFINE_MTYPE_STATIC(RIPNGD, RIPNG_RTE_DATA, "RIPng rte data");
 
 #define DEBUG 1
 
-#define min(a, b) ((a) < (b) ? (a) : (b))
-
 struct ripng_rte_data {
        struct prefix_ipv6 *p;
        struct ripng_info *rinfo;
@@ -151,7 +134,7 @@ void ripng_rte_send(struct list *ripng_rte_list, struct interface *ifp,
        if (mtu < 0)
                mtu = IFMINMTU;
 
-       rtemax = (min(mtu, RIPNG_MAX_PACKET_SIZE) - IPV6_HDRLEN
+       rtemax = (MIN(mtu, RIPNG_MAX_PACKET_SIZE) - IPV6_HDRLEN
                  - sizeof(struct udphdr) - sizeof(struct ripng_packet)
                  + sizeof(struct rte))
                 / sizeof(struct rte);