bgpd: Drop afi_t from bgp_evpn_global_node_lookup()

Not used.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>

diff --git a/bgpd/bgp_evpn.c b/bgpd/bgp_evpn.c
index a7b96a23b8cb67e8a26c62c134bd48c54f798f12..6968558681efd17cf8b738b2a1235de638b34628 100644 (file)
--- a/bgpd/bgp_evpn.c
+++ b/bgpd/bgp_evpn.c
@@ -674,11 +674,9 @@ struct bgp_dest *bgp_evpn_global_node_get(struct bgp_table *table, afi_t afi,
 /*
  * Wrapper for node lookup in global table.
  */
-struct bgp_dest *
-bgp_evpn_global_node_lookup(struct bgp_table *table, afi_t afi, safi_t safi,
-                           const struct prefix_evpn *evp,
-                           struct prefix_rd *prd,
-                           const struct bgp_path_info *local_pi)
+struct bgp_dest *bgp_evpn_global_node_lookup(
+       struct bgp_table *table, safi_t safi, const struct prefix_evpn *evp,
+       struct prefix_rd *prd, const struct bgp_path_info *local_pi)
 {
        struct prefix_evpn global_p;
 
@@ -1358,7 +1356,7 @@ static void evpn_delete_old_local_route(struct bgp *bgp, struct bgpevpn *vpn,
         * L3VPN routes.
         */
        global_dest = bgp_evpn_global_node_lookup(
-               bgp->rib[afi][safi], afi, safi,
+               bgp->rib[afi][safi], safi,
                (const struct prefix_evpn *)bgp_dest_get_prefix(dest),
                &vpn->prd, old_local);
        if (global_dest) {
@@ -2260,8 +2258,8 @@ static int delete_evpn_type5_route(struct bgp *bgp_vrf, struct prefix_evpn *evp)
                return 0;
 
        /* locate the global route entry for this type-5 prefix */
-       dest = bgp_evpn_global_node_lookup(bgp_evpn->rib[afi][safi], afi, safi,
-                                          evp, &bgp_vrf->vrf_prd, NULL);
+       dest = bgp_evpn_global_node_lookup(bgp_evpn->rib[afi][safi], safi, evp,
+                                          &bgp_vrf->vrf_prd, NULL);
        if (!dest)
                return 0;
 
@@ -2297,8 +2295,8 @@ static int delete_evpn_route(struct bgp *bgp, struct bgpevpn *vpn,
         * this table is a 2-level tree (RD-level + Prefix-level) similar to
         * L3VPN routes.
         */
-       global_dest = bgp_evpn_global_node_lookup(bgp->rib[afi][safi], afi,
-                                                 safi, p, &vpn->prd, NULL);
+       global_dest = bgp_evpn_global_node_lookup(bgp->rib[afi][safi], safi, p,
+                                                 &vpn->prd, NULL);
        if (global_dest) {
                /* Delete route entry in the global EVPN table. */
                delete_evpn_route_entry(bgp, afi, safi, global_dest, &pi);
@@ -4317,8 +4315,8 @@ static int delete_withdraw_vni_routes(struct bgp *bgp, struct bgpevpn *vpn)
 
        /* Remove type-3 route for this VNI from global table. */
        build_evpn_type3_prefix(&p, vpn->originator_ip);
-       global_dest = bgp_evpn_global_node_lookup(bgp->rib[afi][safi], afi,
-                                                 safi, &p, &vpn->prd, NULL);
+       global_dest = bgp_evpn_global_node_lookup(bgp->rib[afi][safi], safi, &p,
+                                                 &vpn->prd, NULL);
        if (global_dest) {
                /* Delete route entry in the global EVPN table. */
                delete_evpn_route_entry(bgp, afi, safi, global_dest, &pi);

diff --git a/bgpd/bgp_evpn_mh.c b/bgpd/bgp_evpn_mh.c
index 2f95023aa9773905472483278f12697858f9e08c..4fd0a67911bdda5db85f7cc3ba8959cddcb7778e 100644 (file)
--- a/bgpd/bgp_evpn_mh.c
+++ b/bgpd/bgp_evpn_mh.c
@@ -487,8 +487,8 @@ static int bgp_evpn_mh_route_delete(struct bgp *bgp, struct bgp_evpn_es *es,
        /* Next, locate route node in the global EVPN routing table.
         * Note that this table is a 2-level tree (RD-level + Prefix-level)
         */
-       global_dest = bgp_evpn_global_node_lookup(bgp->rib[afi][safi], afi,
-                                                 safi, p, prd, NULL);
+       global_dest = bgp_evpn_global_node_lookup(bgp->rib[afi][safi], safi, p,
+                                                 prd, NULL);
        if (global_dest) {
 
                /* Delete route entry in the global EVPN table. */

diff --git a/bgpd/bgp_evpn_private.h b/bgpd/bgp_evpn_private.h
index fbf3b19c37cb5de85a2df37562880c4f8c8caddb..fd8d2c118f1c99c4a2f2c83305ca1d1954f906b8 100644 (file)
--- a/bgpd/bgp_evpn_private.h
+++ b/bgpd/bgp_evpn_private.h
@@ -712,11 +712,9 @@ extern struct bgp_dest *
 bgp_evpn_global_node_get(struct bgp_table *table, afi_t afi, safi_t safi,
                         const struct prefix_evpn *evp, struct prefix_rd *prd,
                         const struct bgp_path_info *local_pi);
-extern struct bgp_dest *
-bgp_evpn_global_node_lookup(struct bgp_table *table, afi_t afi, safi_t safi,
-                           const struct prefix_evpn *evp,
-                           struct prefix_rd *prd,
-                           const struct bgp_path_info *local_pi);
+extern struct bgp_dest *bgp_evpn_global_node_lookup(
+       struct bgp_table *table, safi_t safi, const struct prefix_evpn *evp,
+       struct prefix_rd *prd, const struct bgp_path_info *local_pi);
 extern struct bgp_dest *
 bgp_evpn_vni_ip_node_get(struct bgp_table *const table,
                         const struct prefix_evpn *evp,

diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c
index d05768da05145889941e4c7addb47899968ad44a..3937cc5a24960fe7f65be14ce09969386c17295c 100644 (file)
--- a/bgpd/bgp_zebra.c
+++ b/bgpd/bgp_zebra.c
@@ -2596,8 +2596,8 @@ static int bgp_zebra_route_notify_owner(int command, struct zclient *zclient,
        }
 
        /* Find the bgp route node */
-       dest = bgp_afi_node_lookup(bgp->rib[afi][safi], afi, safi, &p,
-                                  &bgp->vrf_prd);
+       dest = bgp_safi_node_lookup(bgp->rib[afi][safi], safi, &p,
+                                   &bgp->vrf_prd);
        if (!dest)
                return -1;