From 13c5bf3f4c4557195261716bd29be3f71615dbbb Mon Sep 17 00:00:00 2001 From: guozhongfeng Date: Fri, 14 Jul 2023 16:08:50 +0800 Subject: [PATCH] zebra: The command ipv6 nht xxx not work If the command is ipv6 nht protocol route-map rmap, this parameter should use AFI_IP6 Signed-off-by: guozhongfeng (cherry picked from commit 1193611f8ea9d2e38d40f17770f8ca1fbfa88ef9) --- zebra/zebra_routemap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zebra/zebra_routemap.c b/zebra/zebra_routemap.c index 4f43cea493..9d706eada3 100644 --- a/zebra/zebra_routemap.c +++ b/zebra/zebra_routemap.c @@ -382,7 +382,7 @@ static int ip_nht_rm_add(struct zebra_vrf *zvrf, const char *rmap, int rtype, route_map_counter_increment(NHT_RM_MAP(zvrf, afi, rtype)); if (NHT_RM_MAP(zvrf, afi, rtype)) - zebra_evaluate_rnh(zvrf, AFI_IP, 1, NULL, SAFI_UNICAST); + zebra_evaluate_rnh(zvrf, afi, 1, NULL, SAFI_UNICAST); return CMD_SUCCESS; } @@ -403,7 +403,7 @@ static int ip_nht_rm_del(struct zebra_vrf *zvrf, const char *rmap, int rtype, zvrf->vrf->vrf_id, rtype); NHT_RM_MAP(zvrf, afi, rtype) = NULL; - zebra_evaluate_rnh(zvrf, AFI_IP, 1, NULL, SAFI_UNICAST); + zebra_evaluate_rnh(zvrf, afi, 1, NULL, SAFI_UNICAST); } XFREE(MTYPE_ROUTE_MAP_NAME, NHT_RM_NAME(zvrf, afi, rtype)); } @@ -1692,7 +1692,7 @@ static void zebra_nht_rm_update(const char *rmap) afi_ipv6 = 1; zebra_evaluate_rnh( - zvrf, AFI_IP, 1, NULL, + zvrf, AFI_IP6, 1, NULL, SAFI_UNICAST); } } -- 2.39.5