Merge pull request #12798 from donaldsharp/rib_match_multicast

[mirror_frr.git] / pimd / pim_vxlan.c

diff --git a/pimd/pim_vxlan.c b/pimd/pim_vxlan.c
index 3565be35bde556d3a7dde62348b62288f66f0918..4c317a25464aedd082667e6dbe26f87764508bf2 100644 (file)
--- a/pimd/pim_vxlan.c
+++ b/pimd/pim_vxlan.c
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /* PIM support for VxLAN BUM flooding
  *
  * Copyright (C) 2019 Cumulus Networks, Inc.
- *
- * This file is part of FRR.
- *
- * FRR 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.
- *
- * FRR 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.
- * 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.
  */
 
 #include <zebra.h>
@@ -303,7 +288,6 @@ static void pim_vxlan_orig_mr_up_add(struct pim_vxlan_sg *vxlan_sg)
        struct pim_upstream *up;
        struct pim_interface *term_ifp;
        int flags = 0;
-       struct prefix nht_p;
        struct pim_instance *pim = vxlan_sg->pim;
 
        if (vxlan_sg->up) {
@@ -353,9 +337,8 @@ static void pim_vxlan_orig_mr_up_add(struct pim_vxlan_sg *vxlan_sg)
                 * iif
                 */
                if (!PIM_UPSTREAM_FLAG_TEST_STATIC_IIF(up->flags)) {
-                       pim_addr_to_prefix(&nht_p, up->upstream_addr);
-                       pim_delete_tracked_nexthop(vxlan_sg->pim, &nht_p, up,
-                                                  NULL);
+                       pim_delete_tracked_nexthop(vxlan_sg->pim,
+                                                  up->upstream_addr, up, NULL);
                }
                /* We are acting FHR; clear out use_rpt setting if any */
                pim_upstream_update_use_rpt(up, false /*update_mroute*/);