summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Stapp <mjs@voltanet.io>2018-11-26 22:07:51 +0100
committerMark Stapp <mjs@voltanet.io>2019-01-22 21:07:24 +0100
commit8a6423a372c082b51792a9b2cd5210041f017a5d (patch)
tree001ac57d56f6b059e7bb975c397d985d545dcf09
parentzebra: fix routing socket logic for labelled nexthops (diff)
downloadfrr-8a6423a372c082b51792a9b2cd5210041f017a5d.tar.xz
frr-8a6423a372c082b51792a9b2cd5210041f017a5d.zip
zebra: remove use of sync LSP update apis
Remove the last use of the pre-dataplane LSP update apis; remove the stubs from the 'null' implementation file. Signed-off-by: Mark Stapp <mjs@voltanet.io>
-rw-r--r--zebra/zebra_mpls.c2
-rw-r--r--zebra/zebra_mpls_null.c15
2 files changed, 1 insertions, 16 deletions
diff --git a/zebra/zebra_mpls.c b/zebra/zebra_mpls.c
index 9806f6836..ae60ac2d6 100644
--- a/zebra/zebra_mpls.c
+++ b/zebra/zebra_mpls.c
@@ -862,7 +862,7 @@ static void lsp_uninstall_from_kernel(struct hash_backet *backet, void *ctxt)
lsp = (zebra_lsp_t *)backet->data;
if (CHECK_FLAG(lsp->flags, LSP_FLAG_INSTALLED))
- (void)kernel_del_lsp(lsp);
+ (void)dplane_lsp_delete(lsp);
}
/*
diff --git a/zebra/zebra_mpls_null.c b/zebra/zebra_mpls_null.c
index eed0610b6..409432c4f 100644
--- a/zebra/zebra_mpls_null.c
+++ b/zebra/zebra_mpls_null.c
@@ -24,21 +24,6 @@
#if !defined(HAVE_NETLINK) && !defined(OPEN_BSD)
-enum zebra_dplane_result kernel_add_lsp(zebra_lsp_t *lsp)
-{
- return ZEBRA_DPLANE_REQUEST_SUCCESS;
-}
-
-enum zebra_dplane_result kernel_upd_lsp(zebra_lsp_t *lsp)
-{
- return ZEBRA_DPLANE_REQUEST_SUCCESS;
-}
-
-enum zebra_dplane_result kernel_del_lsp(zebra_lsp_t *lsp)
-{
- return ZEBRA_DPLANE_REQUEST_SUCCESS;
-}
-
int mpls_kernel_init(void)
{
return -1;