]> git.puffer.fish Git - mirror/frr.git/commitdiff
bgpd: Simplify process queue init
authorPaul Jakma <paul@quagga.net>
Fri, 8 Jan 2010 14:05:32 +0000 (14:05 +0000)
committerPaul Jakma <paul@quagga.net>
Wed, 8 Dec 2010 16:53:08 +0000 (16:53 +0000)
* bgp_route.c: (bgp_process_queue_init) rsclient wasn't getting all the
  same things initialised as the main queue. Simplify to make it more robust.

bgpd/bgp_route.c

index 1cfc451188894f39c9a66707ba5ab79b700c8e46..df23dda3227045637b880bb5c0e192737a4ba724 100644 (file)
@@ -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