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.h | |
| 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.h')
| -rw-r--r-- | bgpd/bgp_fsm.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/bgpd/bgp_fsm.h b/bgpd/bgp_fsm.h index 6937a6c3b..e47d07702 100644 --- a/bgpd/bgp_fsm.h +++ b/bgpd/bgp_fsm.h @@ -26,7 +26,7 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA #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,13 +38,13 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA #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_PEER_WRITE_ON(T,F,V, peer) \ 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) \ @@ -56,7 +56,7 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA #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) \ @@ -68,13 +68,13 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA #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) #define BGP_MSEC_JITTER 10 |