summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2019-01-22 20:55:55 -0500
committerDonald Sharp <sharpd@cumulusnetworks.com>2019-01-22 20:55:55 -0500
commit8841f96e9f0f845c4e0804be6d55674fe67d1a44 (patch)
tree9f699d2a1af813e9746bd31d86a59614be40c679
parent313731ac921b2afdf94fb0aea71e8d503bd20895 (diff)
zebra: Fix compile issues introduced by recent commit on newer compilers
We were using dplane_ctx_get_status(ctx) and assigning that value to zebra_dplane_status, not zebra_dplane_result( yeah what? ) Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
-rw-r--r--zebra/zebra_mpls.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/zebra/zebra_mpls.c b/zebra/zebra_mpls.c
index 4ea7f32446..c255c68866 100644
--- a/zebra/zebra_mpls.c
+++ b/zebra/zebra_mpls.c
@@ -1748,7 +1748,7 @@ void zebra_mpls_lsp_dplane_result(struct zebra_dplane_ctx *ctx)
zebra_nhlfe_t *nhlfe;
struct nexthop *nexthop;
enum dplane_op_e op;
- enum zebra_dplane_status status;
+ enum zebra_dplane_result status;
op = dplane_ctx_get_op(ctx);
status = dplane_ctx_get_status(ctx);
@@ -1780,8 +1780,7 @@ void zebra_mpls_lsp_dplane_result(struct zebra_dplane_ctx *ctx)
/* TODO -- Confirm that this result is still 'current' */
- if (dplane_ctx_get_status(ctx) ==
- ZEBRA_DPLANE_REQUEST_SUCCESS) {
+ if (status == ZEBRA_DPLANE_REQUEST_SUCCESS) {
/* Update zebra object */
SET_FLAG(lsp->flags, LSP_FLAG_INSTALLED);
for (nhlfe = lsp->nhlfe_list; nhlfe;