proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-09 18:50:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3650 from donaldsharp/mpls_compile_issue

Browse Source 
zebra: Fix compile issues introduced by recent commit on newer compilers
This commit is contained in:
Mark Stapp 2019-01-23 12:56:56 -05:00 committed by GitHub
commit 68654cb97a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
zebra/zebra_mpls.c
View File

@ -1748,7 +1748,7 @@ void zebra_mpls_lsp_dplane_result(struct zebra_dplane_ctx *ctx)
zebra_nhlfe_t *nhlfe; zebra_nhlfe_t *nhlfe;
struct nexthop *nexthop; struct nexthop *nexthop;
enum dplane_op_e op; enum dplane_op_e op;
enum zebra_dplane_status status; enum zebra_dplane_result status;
op = dplane_ctx_get_op(ctx); op = dplane_ctx_get_op(ctx);
status = dplane_ctx_get_status(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' */ /* TODO -- Confirm that this result is still 'current' */
if (dplane_ctx_get_status(ctx) == if (status == ZEBRA_DPLANE_REQUEST_SUCCESS) {
ZEBRA_DPLANE_REQUEST_SUCCESS) {
/* Update zebra object */ /* Update zebra object */
SET_FLAG(lsp->flags, LSP_FLAG_INSTALLED); SET_FLAG(lsp->flags, LSP_FLAG_INSTALLED);
for (nhlfe = lsp->nhlfe_list; nhlfe; for (nhlfe = lsp->nhlfe_list; nhlfe;