proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-27 03:33:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #14035 from FRRouting/mergify/bp/dev/9.0/pr-14025

Browse Source 
zebra: The command ipv6 nht xxx not work (backport #14025)
This commit is contained in:
Donald Sharp 2023-07-17 19:50:51 -04:00 committed by GitHub
commit 7ef5b1a562
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zebra/zebra_routemap.c
View File

@ -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)); route_map_counter_increment(NHT_RM_MAP(zvrf, afi, rtype));
if (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; 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); zvrf->vrf->vrf_id, rtype);
NHT_RM_MAP(zvrf, afi, rtype) = NULL; 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)); 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; afi_ipv6 = 1;
zebra_evaluate_rnh( zebra_evaluate_rnh(
zvrf, AFI_IP, 1, NULL, zvrf, AFI_IP6, 1, NULL,
SAFI_UNICAST); SAFI_UNICAST);
} }
} }