From: Stephen Worley <sworley@cumulusnetworks.com>
Date: Tue, 24 Sep 2019 22:40:09 +0000 (-0400)
Subject: zebra: Use ng pointer in mpls_ftn_uninstall
X-Git-Tag: base_7.3~219^2~14
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=b2665a211ed7436dbcd4b477f628c2cdf546c2ca;p=matthieu%2Ffrr.git

zebra: Use ng pointer in mpls_ftn_uninstall

With the new nexthop group shared memory framework, pointers
are being used in route_entry for the nexthop_group. Update
the use of this in `mpls_ftn_uninstall()` to reflect the change.

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

diff --git a/zebra/zebra_mpls.c b/zebra/zebra_mpls.c
index 331ca44c67..ef1bd02608 100644
--- a/zebra/zebra_mpls.c
+++ b/zebra/zebra_mpls.c
@@ -2698,7 +2698,7 @@ int mpls_ftn_uninstall(struct zebra_vrf *zvrf, enum lsp_types_t type,
 	if (re == NULL)
 		return -1;
 
-	for (nexthop = re->ng.nexthop; nexthop; nexthop = nexthop->next)
+	for (nexthop = re->ng->nexthop; nexthop; nexthop = nexthop->next)
 		nexthop_del_labels(nexthop);
 
 	SET_FLAG(re->status, ROUTE_ENTRY_CHANGED);