Merge pull request #14036 from FRRouting/mergify/bp/stable/8.5/pr-14025

zebra: The command ipv6 nht xxx not work (backport #14025)
This commit is contained in:
Donatas Abraitis 2023-07-18 09:20:25 +03:00 committed by GitHub
commit 5979d2e4f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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);
}
}