diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2015-10-14 14:50:39 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2015-10-14 15:16:10 +0200 |
| commit | 9229d914dd36d7cc75cef6269976b4e47e8a6a62 (patch) | |
| tree | 75763944c122ac0ccd970d3882df37dd4eae78f1 /bgpd/bgp_fsm.c | |
| parent | bgpd: backout change of bm->master and master (diff) | |
| download | frr-9229d914dd36d7cc75cef6269976b4e47e8a6a62.tar.xz frr-9229d914dd36d7cc75cef6269976b4e47e8a6a62.zip | |
bgpd: fix using of two pointers for struct thread_master *
Ticket: CM-7861
Reviewed by: CCR-3651
Testing: See bug
bgp is using both bm->master and master pointers interchangebly
for thread manipulation. Since they are the same thing consolidate
to one pointer.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'bgpd/bgp_fsm.c')
| -rw-r--r-- | bgpd/bgp_fsm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bgpd/bgp_fsm.c b/bgpd/bgp_fsm.c index f85bf059d..bd13e1c4b 100644 --- a/bgpd/bgp_fsm.c +++ b/bgpd/bgp_fsm.c @@ -799,7 +799,7 @@ bgp_maxmed_onstartup_begin (struct bgp *bgp) zlog_info ("Begin maxmed onstartup mode - timer %d seconds", bgp->v_maxmed_onstartup); - THREAD_TIMER_ON (master, bgp->t_maxmed_onstartup, + THREAD_TIMER_ON (bm->master, bgp->t_maxmed_onstartup, bgp_maxmed_onstartup_timer, bgp, bgp->v_maxmed_onstartup); @@ -869,11 +869,11 @@ bgp_update_delay_begin (struct bgp *bgp) peer->update_delay_over = 0; /* Start the update-delay timer */ - THREAD_TIMER_ON (master, bgp->t_update_delay, bgp_update_delay_timer, + THREAD_TIMER_ON (bm->master, bgp->t_update_delay, bgp_update_delay_timer, bgp, bgp->v_update_delay); if (bgp->v_establish_wait != bgp->v_update_delay) - THREAD_TIMER_ON (master, bgp->t_establish_wait, bgp_establish_wait_timer, + THREAD_TIMER_ON (bm->master, bgp->t_establish_wait, bgp_establish_wait_timer, bgp, bgp->v_establish_wait); quagga_timestamp(3, bgp->update_delay_begin_time, |