diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2019-01-11 21:43:17 +0100 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2019-01-31 15:20:46 +0100 |
| commit | 2561d12e5db23b499b2f37bf2f0f1c128d7a1ea1 (patch) | |
| tree | 469deda028196b00da3592e8e0341c7f20313711 /zebra/zebra_mpls.c | |
| parent | zebra: Move packets_to_process to zrouter (diff) | |
| download | frr-2561d12e5db23b499b2f37bf2f0f1c128d7a1ea1.tar.xz frr-2561d12e5db23b499b2f37bf2f0f1c128d7a1ea1.zip | |
zebra: Remove `struct zebra_t`
This structure is unused anymore and does not belong in zserv.h
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'zebra/zebra_mpls.c')
| -rw-r--r-- | zebra/zebra_mpls.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/zebra/zebra_mpls.c b/zebra/zebra_mpls.c index 6ce60c464..0aac7d7b1 100644 --- a/zebra/zebra_mpls.c +++ b/zebra/zebra_mpls.c @@ -57,9 +57,6 @@ DEFINE_MTYPE_STATIC(ZEBRA, SNHLFE_IFNAME, "MPLS static nexthop ifname") int mpls_enabled; -/* Default rtm_table for all clients */ -extern struct zebra_t zebrad; - /* static function declarations */ static void fec_evaluate(struct zebra_vrf *zvrf); @@ -127,7 +124,6 @@ static zebra_snhlfe_t *snhlfe_add(zebra_slsp_t *slsp, static int snhlfe_del(zebra_snhlfe_t *snhlfe); static int snhlfe_del_all(zebra_slsp_t *slsp); static char *snhlfe2str(zebra_snhlfe_t *snhlfe, char *buf, int size); -static int mpls_processq_init(struct zebra_t *zebra); /* Static functions */ @@ -1715,7 +1711,7 @@ static char *snhlfe2str(zebra_snhlfe_t *snhlfe, char *buf, int size) /* * Initialize work queue for processing changed LSPs. */ -static int mpls_processq_init(struct zebra_t *zebra) +static int mpls_processq_init(void) { zrouter.lsp_process_q = work_queue_new(zrouter.master, "LSP processing"); if (!zrouter.lsp_process_q) { @@ -3063,7 +3059,7 @@ void zebra_mpls_init(void) return; } - if (!mpls_processq_init(&zebrad)) + if (!mpls_processq_init()) mpls_enabled = 1; hook_register(zserv_client_close, zebra_mpls_cleanup_fecs_for_client); |