zebra: remove "PENDING" dplane request state

This request state is redundant with new message batching interface.

Signed-off-by: Jakub Urbańczyk <xthaid@gmail.com>

diff --git a/zebra/zebra_dplane.c b/zebra/zebra_dplane.c
index 7d060943f1d4f51e4234471f9c10a96d6b6ed87c..2520a029b90828e7e55eb4ddad974e3914ade38f 100644 (file)
--- 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 32032ed77d58806d6ffbfb76dbf2a646bd3b44f2..3b5eda248675ca9ea11ea376508d57422b2852da 100644 (file)
--- 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 a30cea6a1eae3f56e6c8a770c6e95a1f8865a7ae..03b8c8de1fca64f8555d02e6748f1286babbcb07 100644 (file)
--- 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 afae449e7cecf9811141c23aaf71d8c1a14f5a9a..55dccc4a1253824e806701c3fa051e71b355a9e7 100644 (file)
--- 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;