From: Stephen Worley <sworley@cumulusnetworks.com>
Date: Tue, 14 May 2019 21:45:09 +0000 (-0700)
Subject: zebra: Free the nhe dataplane ctx always
X-Git-Tag: base_7.3~219^2~94
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=71593b3f0f67b797fa90571fa7c5a56cd5d8ef89;p=matthieu%2Ffrr.git

zebra: Free the nhe dataplane ctx always

Free the nhe dataplane context no matter whether the operation
was successful or not.

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

diff --git a/zebra/zebra_nhg.c b/zebra/zebra_nhg.c
index b5fd76b31f..7373805d2c 100644
--- a/zebra/zebra_nhg.c
+++ b/zebra/zebra_nhg.c
@@ -1306,13 +1306,12 @@ void zebra_nhg_dplane_result(struct zebra_dplane_ctx *ctx)
 		case DPLANE_OP_NONE:
 			break;
 		}
-		dplane_ctx_fini(&ctx);
-
-	} else {
+	} else
 		flog_err(
 			EC_ZEBRA_NHG_SYNC,
 			"%s operation preformed on Nexthop ID (%u) in the kernel, that we no longer have in our table",
 			dplane_op2str(op), id);
-	}
+
+	dplane_ctx_fini(&ctx);
 }