diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2021-03-02 13:21:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-02 13:21:47 +0100 |
| commit | fe914c4b60038cfd5e96ce0b10dc3b437248b62e (patch) | |
| tree | 1f9ec6888568be19016677eb2fdc89b21a1e050d /bgpd | |
| parent | Merge pull request #8021 from AnuradhaKaruppiah/evpn-weak-override-fix (diff) | |
| parent | libs, bgpd: improve task cancellation by argument value (diff) | |
| download | frr-fe914c4b60038cfd5e96ce0b10dc3b437248b62e.tar.xz frr-fe914c4b60038cfd5e96ce0b10dc3b437248b62e.zip | |
Merge pull request #7951 from mjstapp/fix_cancel_event
libs, bgpd: improve task cancellation by argument value
Diffstat (limited to 'bgpd')
| -rw-r--r-- | bgpd/bgp_fsm.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bgpd/bgp_fsm.h b/bgpd/bgp_fsm.h index cd464d8c5..bf4966c83 100644 --- a/bgpd/bgp_fsm.h +++ b/bgpd/bgp_fsm.h @@ -31,7 +31,7 @@ #define BGP_TIMER_OFF(T) \ do { \ - THREAD_OFF(T); \ + THREAD_OFF((T)); \ } while (0) #define BGP_EVENT_ADD(P, E) \ @@ -44,7 +44,7 @@ #define BGP_EVENT_FLUSH(P) \ do { \ assert(peer); \ - thread_cancel_event(bm->master, (P)); \ + thread_cancel_event_ready(bm->master, (P)); \ } while (0) #define BGP_UPDATE_GROUP_TIMER_ON(T, F) \ @@ -53,10 +53,10 @@ PEER_ROUTE_ADV_DELAY(peer)) \ thread_add_timer_msec(bm->master, (F), peer, \ (BGP_DEFAULT_UPDATE_ADVERTISEMENT_TIME * 1000),\ - T); \ + (T)); \ else \ thread_add_timer_msec(bm->master, (F), peer, \ - 0, T); \ + 0, (T)); \ } while (0) \ #define BGP_MSEC_JITTER 10 |