From: Stephen Worley <sworley@cumulusnetworks.com>
Date: Fri, 4 Oct 2019 17:54:39 +0000 (-0400)
Subject: pbrd: nexthop_group delete cb don't free pbr->nhg
X-Git-Tag: frr-7.5.1~1110^2~13
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;ds=sidebyside;h=cd36b87d8c067626dce566143e7998d0a0a9b722;p=mirror_frr.git

pbrd: nexthop_group delete cb don't free pbr->nhg

The pbr->nhg callback is used exclusively for individual nexthops
set through `set nexthop`. If an actuall "tracked" nexthop_group is
used, only the `pbrms->nhgrp_name` is set. Thus this delete does
nothing.

Signed-off-by: Stephen Worley <sworley@cumulusnetworks.com>
---

diff --git a/pbrd/pbr_nht.c b/pbrd/pbr_nht.c
index 67a1fe2ff..062cfd015 100644
--- a/pbrd/pbr_nht.c
+++ b/pbrd/pbr_nht.c
@@ -639,7 +639,6 @@ void pbr_nht_delete_group(const char *name)
 			if (pbrms->nhgrp_name
 			    && strmatch(pbrms->nhgrp_name, name)) {
 				pbrms->reason |= PBR_MAP_INVALID_NO_NEXTHOPS;
-				nexthop_group_delete(&pbrms->nhg);
 				pbrms->nhg = NULL;
 				pbrms->internal_nhg_name = NULL;
 				pbrm->valid = false;