lib,zebra: remove unused ZEBRA_VRF_UNREGISTER

Signed-off-by: Donna Sharp <dksharp5@gmail.com>

diff --git a/lib/log.c b/lib/log.c
index 880180ae5a94dc4d7f9483b1be194f980e1dc943..04b789b5da5d622da91d17ffab0575340b3ede6b 100644 (file)
--- a/lib/log.c
+++ b/lib/log.c
@@ -351,7 +351,6 @@ static const struct zebra_desc_table command_types[] = {
        DESC_ENTRY(ZEBRA_BFD_DEST_REPLAY),
        DESC_ENTRY(ZEBRA_REDISTRIBUTE_ROUTE_ADD),
        DESC_ENTRY(ZEBRA_REDISTRIBUTE_ROUTE_DEL),
-       DESC_ENTRY(ZEBRA_VRF_UNREGISTER),
        DESC_ENTRY(ZEBRA_VRF_ADD),
        DESC_ENTRY(ZEBRA_VRF_DELETE),
        DESC_ENTRY(ZEBRA_VRF_LABEL),

diff --git a/lib/zclient.h b/lib/zclient.h
index 2877b347d8d0eff1562804528f8e5f18136da670..91c0c9ed6d3dd8b1f95a2e63773f80da40450a39 100644 (file)
--- a/lib/zclient.h
+++ b/lib/zclient.h
@@ -124,7 +124,6 @@ typedef enum {
        ZEBRA_BFD_DEST_REPLAY,
        ZEBRA_REDISTRIBUTE_ROUTE_ADD,
        ZEBRA_REDISTRIBUTE_ROUTE_DEL,
-       ZEBRA_VRF_UNREGISTER,
        ZEBRA_VRF_ADD,
        ZEBRA_VRF_DELETE,
        ZEBRA_VRF_LABEL,

diff --git a/zebra/zapi_msg.c b/zebra/zapi_msg.c
index c45c61a208accb19911089a02dd28a2574d0c1b0..b13d58f99d12d2aef864879030a9a77a84349d01 100644 (file)
--- a/zebra/zapi_msg.c
+++ b/zebra/zapi_msg.c
@@ -2477,22 +2477,6 @@ stream_failure:
        return;
 }
 
-/* Unregister all information in a VRF. */
-static void zread_vrf_unregister(ZAPI_HANDLER_ARGS)
-{
-       int i;
-       afi_t afi;
-
-       for (afi = AFI_IP; afi < AFI_MAX; afi++) {
-               for (i = 0; i < ZEBRA_ROUTE_MAX; i++)
-                       vrf_bitmap_unset(&client->redist[afi][i],
-                                        zvrf_id(zvrf));
-               vrf_bitmap_unset(&client->redist_default[afi], zvrf_id(zvrf));
-               vrf_bitmap_unset(&client->ridinfo[afi], zvrf_id(zvrf));
-               vrf_bitmap_unset(&client->neighinfo[afi], zvrf_id(zvrf));
-       }
-}
-
 /*
  * Validate incoming zapi mpls lsp / labels message
  */
@@ -4055,7 +4039,6 @@ void (*const zserv_handlers[])(ZAPI_HANDLER_ARGS) = {
 #if HAVE_BFDD > 0
        [ZEBRA_BFD_DEST_REPLAY] = zebra_ptm_bfd_dst_replay,
 #endif /* HAVE_BFDD */
-       [ZEBRA_VRF_UNREGISTER] = zread_vrf_unregister,
        [ZEBRA_VRF_LABEL] = zread_vrf_label,
        [ZEBRA_BFD_CLIENT_REGISTER] = zebra_ptm_bfd_client_register,
        [ZEBRA_INTERFACE_ENABLE_RADV] = zebra_interface_radv_enable,