From f5b7e50f9a5d33a04ecf040dddbd6b05ae9dfda5 Mon Sep 17 00:00:00 2001 From: Mark Stapp Date: Mon, 11 Jan 2021 13:53:42 -0500 Subject: [PATCH] zebra: use afi_t for route-map address family arg Use afi_t in the route_map_check api Signed-off-by: Mark Stapp --- zebra/zebra_nhg.c | 2 +- zebra/zebra_routemap.c | 2 +- zebra/zebra_routemap.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/zebra/zebra_nhg.c b/zebra/zebra_nhg.c index 0a692feb35..ff020af4d6 100644 --- a/zebra/zebra_nhg.c +++ b/zebra/zebra_nhg.c @@ -2119,7 +2119,7 @@ static unsigned nexthop_active_check(struct route_node *rn, { struct interface *ifp; route_map_result_t ret = RMAP_PERMITMATCH; - int family; + afi_t family; const struct prefix *p, *src_p; struct zebra_vrf *zvrf; diff --git a/zebra/zebra_routemap.c b/zebra/zebra_routemap.c index bbc8b6f19d..858f29ce9c 100644 --- a/zebra/zebra_routemap.c +++ b/zebra/zebra_routemap.c @@ -1669,7 +1669,7 @@ void zebra_routemap_finish(void) } route_map_result_t -zebra_route_map_check(int family, int rib_type, uint8_t instance, +zebra_route_map_check(afi_t family, int rib_type, uint8_t instance, const struct prefix *p, struct nexthop *nexthop, struct zebra_vrf *zvrf, route_tag_t tag) { diff --git a/zebra/zebra_routemap.h b/zebra/zebra_routemap.h index 251e07af72..c016d95875 100644 --- a/zebra/zebra_routemap.h +++ b/zebra/zebra_routemap.h @@ -42,7 +42,7 @@ zebra_import_table_route_map_check(int family, int rib_type, uint8_t instance, struct nexthop *nexthop, vrf_id_t vrf_id, route_tag_t tag, const char *rmap_name); extern route_map_result_t -zebra_route_map_check(int family, int rib_type, uint8_t instance, +zebra_route_map_check(afi_t family, int rib_type, uint8_t instance, const struct prefix *p, struct nexthop *nexthop, struct zebra_vrf *zvrf, route_tag_t tag); extern route_map_result_t -- 2.39.5