]> git.puffer.fish Git - mirror/frr.git/commitdiff
bgpd: remove duplicated arg in leak_update
authorLouis Scalbert <louis.scalbert@6wind.com>
Thu, 5 May 2022 12:19:53 +0000 (14:19 +0200)
committerLouis Scalbert <louis.scalbert@6wind.com>
Mon, 11 Jul 2022 14:08:33 +0000 (16:08 +0200)
Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>
bgpd/bgp_mplsvpn.c

index 81899b63c0639f42130e05edd7d67ada40b5a2c6..db36d343cc50a03b568b932ba3eb2acb34fca302 100644 (file)
@@ -823,15 +823,15 @@ static struct bgp_path_info *
 leak_update(struct bgp *bgp, /* destination bgp instance */
            struct bgp_dest *bn, struct attr *new_attr, /* already interned */
            afi_t afi, safi_t safi, struct bgp_path_info *source_bpi,
-           mpls_label_t *label, uint32_t num_labels, void *parent,
-           struct bgp *bgp_orig, struct prefix *nexthop_orig,
-           int nexthop_self_flag, int debug)
+           mpls_label_t *label, uint32_t num_labels, struct bgp *bgp_orig,
+           struct prefix *nexthop_orig, int nexthop_self_flag, int debug)
 {
        const struct prefix *p = bgp_dest_get_prefix(bn);
        struct bgp_path_info *bpi;
        struct bgp_path_info *new;
        struct bgp_path_info_extra *extra;
        uint32_t num_sids = 0;
+       void *parent = source_bpi;
 
        if (new_attr->srv6_l3vpn || new_attr->srv6_vpn)
                num_sids = 1;
@@ -1296,9 +1296,9 @@ void vpn_leak_from_vrf_update(struct bgp *bgp_vpn,            /* to */
 
        struct bgp_path_info *new_info;
 
-       new_info = leak_update(bgp_vpn, bn, new_attr, afi, safi, path_vrf,
-                              &label, 1, path_vrf, bgp_vrf, NULL,
-                              nexthop_self_flag, debug);
+       new_info =
+               leak_update(bgp_vpn, bn, new_attr, afi, safi, path_vrf, &label,
+                           1, bgp_vrf, NULL, nexthop_self_flag, debug);
 
        /*
         * Routes actually installed in the vpn RIB must also be
@@ -1669,8 +1669,8 @@ vpn_leak_to_vrf_update_onevrf(struct bgp *bgp_vrf,            /* to */
                src_vrf = bgp_vpn;
 
        leak_update(bgp_vrf, bn, new_attr, afi, safi, path_vpn, pLabels,
-                   num_labels, path_vpn, /* parent */
-                   src_vrf, &nexthop_orig, nexthop_self_flag, debug);
+                   num_labels, src_vrf, &nexthop_orig, nexthop_self_flag,
+                   debug);
 }
 
 void vpn_leak_to_vrf_update(struct bgp *bgp_vpn,           /* from */