*: auto-convert to SPDX License IDs

[mirror_frr.git] / pimd / pim_msdp.c

diff --git a/pimd/pim_msdp.c b/pimd/pim_msdp.c
index 7c1c80f71ab90a897c29c461e37e8cb444e7b871..dfa5ffeeec64b81bbd6f7450216129f8b6e8b1e9 100644 (file)
--- a/pimd/pim_msdp.c
+++ b/pimd/pim_msdp.c
@@ -1,20 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * IP MSDP for Quagga
  * Copyright (C) 2016 Cumulus Networks, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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>
@@ -32,6 +19,7 @@
 
 #include "pimd.h"
 #include "pim_memory.h"
+#include "pim_instance.h"
 #include "pim_iface.h"
 #include "pim_rp.h"
 #include "pim_str.h"
@@ -709,8 +697,8 @@ bool pim_msdp_peer_rpf_check(struct pim_msdp_peer *mp, struct in_addr rp)
        }
 
        /* check if the MSDP peer is the nexthop for the RP */
-       if (pim_nexthop_lookup(mp->pim, &nexthop, rp, 0)
-           && nexthop.mrib_nexthop_addr.u.prefix4.s_addr == mp->peer.s_addr) {
+       if (pim_nexthop_lookup(mp->pim, &nexthop, rp, 0) &&
+           nexthop.mrib_nexthop_addr.s_addr == mp->peer.s_addr) {
                return true;
        }