diff options
| author | Russ White <russ@riw.us> | 2018-09-24 10:54:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-24 10:54:16 -0400 |
| commit | a1b32de24ed520a53499f6e81d6ee8eaac548bd1 (patch) | |
| tree | 5ce26f8b92502977830006b7d8e99fba93cd7970 /zebra/zebra_mpls.c | |
| parent | b3630e8436656d6be6d65c5cc67690a19159087a (diff) | |
| parent | 5be41a1c8b25cf3fe9190267ba86ce80780bd5bd (diff) | |
Merge pull request #3052 from donaldsharp/dplane_2
Dplane 2
Diffstat (limited to 'zebra/zebra_mpls.c')
| -rw-r--r-- | zebra/zebra_mpls.c | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/zebra/zebra_mpls.c b/zebra/zebra_mpls.c index c19aeb6260..0d1ccdc5aa 100644 --- a/zebra/zebra_mpls.c +++ b/zebra/zebra_mpls.c @@ -917,14 +917,14 @@ static wq_item_status lsp_process(struct work_queue *wq, void *data) UNSET_FLAG(lsp->flags, LSP_FLAG_CHANGED); switch (kernel_add_lsp(lsp)) { - case DP_REQUEST_QUEUED: + case ZEBRA_DPLANE_REQUEST_QUEUED: flog_err( EC_ZEBRA_DP_INVALID_RC, "No current DataPlane interfaces can return this, please fix"); break; - case DP_REQUEST_FAILURE: + case ZEBRA_DPLANE_REQUEST_FAILURE: break; - case DP_REQUEST_SUCCESS: + case ZEBRA_DPLANE_REQUEST_SUCCESS: zvrf->lsp_installs++; break; } @@ -934,14 +934,14 @@ static wq_item_status lsp_process(struct work_queue *wq, void *data) if (!newbest) { switch (kernel_del_lsp(lsp)) { - case DP_REQUEST_QUEUED: + case ZEBRA_DPLANE_REQUEST_QUEUED: flog_err( EC_ZEBRA_DP_INVALID_RC, "No current DataPlane interfaces can return this, please fix"); break; - case DP_REQUEST_FAILURE: + case ZEBRA_DPLANE_REQUEST_FAILURE: break; - case DP_REQUEST_SUCCESS: + case ZEBRA_DPLANE_REQUEST_SUCCESS: zvrf->lsp_removals++; break; } @@ -974,14 +974,14 @@ static wq_item_status lsp_process(struct work_queue *wq, void *data) } switch (kernel_upd_lsp(lsp)) { - case DP_REQUEST_QUEUED: + case ZEBRA_DPLANE_REQUEST_QUEUED: flog_err( EC_ZEBRA_DP_INVALID_RC, "No current DataPlane interfaces can return this, please fix"); break; - case DP_REQUEST_FAILURE: + case ZEBRA_DPLANE_REQUEST_FAILURE: break; - case DP_REQUEST_SUCCESS: + case ZEBRA_DPLANE_REQUEST_SUCCESS: zvrf->lsp_installs++; break; } @@ -1716,7 +1716,7 @@ static int mpls_processq_init(struct zebra_t *zebra) /* Public functions */ -void kernel_lsp_pass_fail(zebra_lsp_t *lsp, enum dp_results res) +void kernel_lsp_pass_fail(zebra_lsp_t *lsp, enum zebra_dplane_status res) { struct nexthop *nexthop; zebra_nhlfe_t *nhlfe; @@ -1725,13 +1725,13 @@ void kernel_lsp_pass_fail(zebra_lsp_t *lsp, enum dp_results res) return; switch (res) { - case DP_INSTALL_FAILURE: + case ZEBRA_DPLANE_INSTALL_FAILURE: UNSET_FLAG(lsp->flags, LSP_FLAG_INSTALLED); clear_nhlfe_installed(lsp); flog_warn(EC_ZEBRA_LSP_INSTALL_FAILURE, "LSP Install Failure: %u", lsp->ile.in_label); break; - case DP_INSTALL_SUCCESS: + case ZEBRA_DPLANE_INSTALL_SUCCESS: SET_FLAG(lsp->flags, LSP_FLAG_INSTALLED); for (nhlfe = lsp->nhlfe_list; nhlfe; nhlfe = nhlfe->next) { nexthop = nhlfe->nexthop; @@ -1742,14 +1742,16 @@ void kernel_lsp_pass_fail(zebra_lsp_t *lsp, enum dp_results res) SET_FLAG(nexthop->flags, NEXTHOP_FLAG_FIB); } break; - case DP_DELETE_SUCCESS: + case ZEBRA_DPLANE_DELETE_SUCCESS: UNSET_FLAG(lsp->flags, LSP_FLAG_INSTALLED); clear_nhlfe_installed(lsp); break; - case DP_DELETE_FAILURE: + case ZEBRA_DPLANE_DELETE_FAILURE: flog_warn(EC_ZEBRA_LSP_DELETE_FAILURE, "LSP Deletion Failure: %u", lsp->ile.in_label); break; + case ZEBRA_DPLANE_STATUS_NONE: + break; } } |