From 86d562236224187bde6d27e69cce8c74ac1012e2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jakub=20Urba=C5=84czyk?= Date: Wed, 15 Jul 2020 15:12:22 +0200 Subject: [PATCH] zebra: remove "PENDING" dplane request state MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This request state is redundant with new message batching interface. Signed-off-by: Jakub Urbańczyk --- zebra/zebra_dplane.c | 2 -- zebra/zebra_dplane.h | 1 - zebra/zebra_mpls.c | 11 ----------- zebra/zebra_rib.c | 6 ------ 4 files changed, 20 deletions(-) diff --git a/zebra/zebra_dplane.c b/zebra/zebra_dplane.c index 7d060943f1..2520a029b9 100644 --- a/zebra/zebra_dplane.c +++ b/zebra/zebra_dplane.c @@ -858,8 +858,6 @@ const char *dplane_res2str(enum zebra_dplane_result res) case ZEBRA_DPLANE_REQUEST_SUCCESS: ret = "SUCCESS"; break; - case ZEBRA_DPLANE_REQUEST_PENDING: - ret = "PENDING"; } return ret; diff --git a/zebra/zebra_dplane.h b/zebra/zebra_dplane.h index 32032ed77d..3b5eda2486 100644 --- a/zebra/zebra_dplane.h +++ b/zebra/zebra_dplane.h @@ -90,7 +90,6 @@ enum zebra_dplane_result { ZEBRA_DPLANE_REQUEST_QUEUED, ZEBRA_DPLANE_REQUEST_SUCCESS, ZEBRA_DPLANE_REQUEST_FAILURE, - ZEBRA_DPLANE_REQUEST_PENDING, }; /* diff --git a/zebra/zebra_mpls.c b/zebra/zebra_mpls.c index a30cea6a1e..03b8c8de1f 100644 --- a/zebra/zebra_mpls.c +++ b/zebra/zebra_mpls.c @@ -956,9 +956,6 @@ static wq_item_status lsp_process(struct work_queue *wq, void *data) case ZEBRA_DPLANE_REQUEST_SUCCESS: zvrf->lsp_installs++; break; - /* Should never happen */ - case ZEBRA_DPLANE_REQUEST_PENDING: - break; } } } else { @@ -984,10 +981,6 @@ static wq_item_status lsp_process(struct work_queue *wq, void *data) case ZEBRA_DPLANE_REQUEST_SUCCESS: zvrf->lsp_removals++; break; - - /* Should never happen */ - case ZEBRA_DPLANE_REQUEST_PENDING: - break; } } else if (CHECK_FLAG(lsp->flags, LSP_FLAG_CHANGED)) { zebra_nhlfe_t *nhlfe; @@ -1031,10 +1024,6 @@ static wq_item_status lsp_process(struct work_queue *wq, void *data) case ZEBRA_DPLANE_REQUEST_SUCCESS: zvrf->lsp_installs++; break; - - /* Should never happen */ - case ZEBRA_DPLANE_REQUEST_PENDING: - break; } } } diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c index afae449e7c..55dccc4a12 100644 --- a/zebra/zebra_rib.c +++ b/zebra/zebra_rib.c @@ -497,9 +497,6 @@ void rib_install_kernel(struct route_node *rn, struct route_entry *re, if (zvrf) zvrf->installs++; break; - /* Should never happen */ - case ZEBRA_DPLANE_REQUEST_PENDING: - break; } return; @@ -544,9 +541,6 @@ void rib_uninstall_kernel(struct route_node *rn, struct route_entry *re) if (zvrf) zvrf->removals++; break; - /* Should never happen */ - case ZEBRA_DPLANE_REQUEST_PENDING: - break; } return; -- 2.39.5