diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2019-01-11 13:31:46 -0500 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2019-01-31 09:20:46 -0500 |
| commit | 3801e7646c73b4b0122ea02eb35e8d39c3796c95 (patch) | |
| tree | 1cc94938f78745afc8f83b506efc93d6eb9a4f49 /zebra/zebra_rib.c | |
| parent | 19b336d343464047eb959d1a3a2b0e08c1461c1f (diff) | |
zebra: Move the master thread handler to the zrouter structure
The master thread handler is really part of the zrouter structure.
So let's move it over to that. Eventually zserv.h will only be
used for zapi messages.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'zebra/zebra_rib.c')
| -rw-r--r-- | zebra/zebra_rib.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c index 3a8ec0249a..fd228d754b 100644 --- a/zebra/zebra_rib.c +++ b/zebra/zebra_rib.c @@ -2326,7 +2326,8 @@ static void rib_queue_init(struct zebra_t *zebra) assert(zebra); if (!(zebra->ribq = - work_queue_new(zebra->master, "route_node processing"))) { + work_queue_new(zrouter.master, + "route_node processing"))) { flog_err(EC_ZEBRA_WQ_NONEXISTENT, "%s: could not initialise work queue!", __func__); return; @@ -3313,7 +3314,7 @@ static int rib_dplane_results(struct dplane_ctx_q *ctxlist) pthread_mutex_unlock(&dplane_mutex); /* Ensure event is signalled to zebra main pthread */ - thread_add_event(zebrad.master, rib_process_dplane_results, NULL, 0, + thread_add_event(zrouter.master, rib_process_dplane_results, NULL, 0, &t_dplane); return 0; |