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_damp.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_damp.c')
| -rw-r--r-- | bgpd/bgp_damp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bgpd/bgp_damp.c b/bgpd/bgp_damp.c index 21df08657..a4ce5ae3f 100644 --- a/bgpd/bgp_damp.c +++ b/bgpd/bgp_damp.c @@ -116,7 +116,7 @@ bgp_reuse_timer (struct thread *t) damp->t_reuse = NULL; damp->t_reuse = - thread_add_timer (master, bgp_reuse_timer, NULL, DELTA_REUSE); + thread_add_timer (bm->master, bgp_reuse_timer, NULL, DELTA_REUSE); t_now = bgp_clock (); @@ -448,7 +448,7 @@ bgp_damp_enable (struct bgp *bgp, afi_t afi, safi_t safi, time_t half, /* Register reuse timer. */ if (! damp->t_reuse) damp->t_reuse = - thread_add_timer (master, bgp_reuse_timer, NULL, DELTA_REUSE); + thread_add_timer (bm->master, bgp_reuse_timer, NULL, DELTA_REUSE); return 0; } |