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_dump.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_dump.c')
| -rw-r--r-- | bgpd/bgp_dump.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bgpd/bgp_dump.c b/bgpd/bgp_dump.c index 58c661227..8edf63640 100644 --- a/bgpd/bgp_dump.c +++ b/bgpd/bgp_dump.c @@ -159,13 +159,13 @@ bgp_dump_interval_add (struct bgp_dump *bgp_dump, int interval) secs_into_day = tm->tm_sec + 60*tm->tm_min + 60*60*tm->tm_hour; interval = interval - secs_into_day % interval; /* always > 0 */ } - bgp_dump->t_interval = thread_add_timer (master, bgp_dump_interval_func, + bgp_dump->t_interval = thread_add_timer (bm->master, bgp_dump_interval_func, bgp_dump, interval); } else { /* One-off dump: execute immediately, don't affect any scheduled dumps */ - bgp_dump->t_interval = thread_add_event (master, bgp_dump_interval_func, + bgp_dump->t_interval = thread_add_event (bm->master, bgp_dump_interval_func, bgp_dump, 0); } |