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 <guozhongfeng.gzf@alibaba-inc.com>
(cherry picked from commit 1193611f8ea9d2e38d40f17770f8ca1fbfa88ef9)

diff --git a/zebra/zebra_routemap.c b/zebra/zebra_routemap.c
index 142501b14994168e08158bb9439f53bc7b301552..eb94e26c30564b084158e993e57d2e42ee4ba073 100644 (file)
--- a/zebra/zebra_routemap.c
+++ b/zebra/zebra_routemap.c
@@ -367,7 +367,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;
 }
@@ -388,7 +388,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));
        }
@@ -1703,7 +1703,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);
                                        }
                                }