]> git.puffer.fish Git - matthieu/frr.git/commitdiff
zebra: Fix compile issues introduced by recent commit on newer compilers
authorDonald Sharp <sharpd@cumulusnetworks.com>
Wed, 23 Jan 2019 01:55:55 +0000 (20:55 -0500)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Wed, 23 Jan 2019 01:55:55 +0000 (20:55 -0500)
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>
zebra/zebra_mpls.c

index 4ea7f32446c0ded76200262cb1a1e543be7b819f..c255c68866794d509d8e71ca4830aa286a81cc6b 100644 (file)
@@ -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;