bgpd: fix using of two pointers for struct thread_master *
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>
diff --git a/bgpd/bgp_fsm.h b/bgpd/bgp_fsm.h
index a749f8e..752d6e2 100644
--- a/bgpd/bgp_fsm.h
+++ b/bgpd/bgp_fsm.h
@@ -26,7 +26,7 @@
#define BGP_READ_ON(T,F,V) \
do { \
if (!(T) && (peer->status != Deleted)) \
- THREAD_READ_ON(master,T,F,peer,V); \
+ THREAD_READ_ON(bm->master,T,F,peer,V); \
} while (0)
#define BGP_READ_OFF(T) \
@@ -38,7 +38,7 @@
#define BGP_WRITE_ON(T,F,V) \
do { \
if (!(T) && (peer->status != Deleted)) \
- THREAD_WRITE_ON(master,(T),(F),peer,(V)); \
+ THREAD_WRITE_ON(bm->master,(T),(F),peer,(V)); \
} while (0)
#define BGP_WRITE_OFF(T) \
@@ -50,7 +50,7 @@
#define BGP_TIMER_ON(T,F,V) \
do { \
if (!(T) && (peer->status != Deleted)) \
- THREAD_TIMER_ON(master,(T),(F),peer,(V)); \
+ THREAD_TIMER_ON(bm->master,(T),(F),peer,(V)); \
} while (0)
#define BGP_TIMER_OFF(T) \
@@ -62,13 +62,13 @@
#define BGP_EVENT_ADD(P,E) \
do { \
if ((P)->status != Deleted) \
- thread_add_event (master, bgp_event, (P), (E)); \
+ thread_add_event (bm->master, bgp_event, (P), (E)); \
} while (0)
#define BGP_EVENT_FLUSH(P) \
do { \
assert (peer); \
- thread_cancel_event (master, (P)); \
+ thread_cancel_event (bm->master, (P)); \
} while (0)
/* Prototypes. */