diff options
| author | David Lamparter <equinox@diac24.net> | 2010-02-05 01:41:22 +0100 |
|---|---|---|
| committer | David Lamparter <equinox@diac24.net> | 2010-02-05 01:41:22 +0100 |
| commit | e473267ee96f48514b879f5dcaba2db64f0de9d1 (patch) | |
| tree | 6c252d564a2e2c00ef12abddd02fccd7ea89bc05 /bgpd/bgp_route.c | |
| parent | f06277c84f7604b380bdac491e23c848d4952d18 (diff) | |
| parent | b0c8c48d7fa4c691ddbe07403ccc37a26258a25e (diff) | |
| download | quagga-e473267ee96f48514b879f5dcaba2db64f0de9d1.tar.bz2 quagga-e473267ee96f48514b879f5dcaba2db64f0de9d1.tar.xz | |
Merge branch 'patches/pj_workqueue' into dn42
Conflicts:
lib/thread.c
Diffstat (limited to 'bgpd/bgp_route.c')
| -rw-r--r-- | bgpd/bgp_route.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index 8e068fc4..3d0417b1 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -1614,14 +1614,13 @@ bgp_process_queue_init (void) } bm->process_main_queue->spec.workfunc = &bgp_process_main; - bm->process_rsclient_queue->spec.workfunc = &bgp_process_rsclient; bm->process_main_queue->spec.del_item_data = &bgp_processq_del; - bm->process_rsclient_queue->spec.del_item_data - = bm->process_main_queue->spec.del_item_data; - bm->process_main_queue->spec.max_retries - = bm->process_main_queue->spec.max_retries = 0; - bm->process_rsclient_queue->spec.hold - = bm->process_main_queue->spec.hold = 50; + bm->process_main_queue->spec.max_retries = 0; + bm->process_main_queue->spec.hold = 50; + + memcpy (bm->process_rsclient_queue, bm->process_main_queue, + sizeof (struct work_queue *)); + bm->process_rsclient_queue->spec.workfunc = &bgp_process_rsclient; } void |