diff options
| author | Mark Stapp <mjs@voltanet.io> | 2019-01-23 12:56:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-23 12:56:56 -0500 |
| commit | 68654cb97a115b481f09b8088ca97671eb9dd92f (patch) | |
| tree | 3c3f3fb259f8dd51d0d6dfaaf055ede62d3caad8 | |
| parent | 166e1cc5bcb341cf481343e6b4680dfc9240a8c0 (diff) | |
| parent | 8841f96e9f0f845c4e0804be6d55674fe67d1a44 (diff) | |
Merge pull request #3650 from donaldsharp/mpls_compile_issue
zebra: Fix compile issues introduced by recent commit on newer compilers
| -rw-r--r-- | zebra/zebra_mpls.c | 5 |
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; |