diff options
Diffstat (limited to 'bgpd')
| -rw-r--r-- | bgpd/bgp_fsm.c | 4 | ||||
| -rw-r--r-- | bgpd/bgp_io.c | 6 | ||||
| -rw-r--r-- | bgpd/bgp_keepalives.c | 6 | ||||
| -rw-r--r-- | bgpd/bgp_packet.c | 6 | ||||
| -rw-r--r-- | bgpd/rfapi/rfapi.c | 2 | ||||
| -rw-r--r-- | bgpd/rfapi/vnc_zebra.c | 2 |
6 files changed, 13 insertions, 13 deletions
diff --git a/bgpd/bgp_fsm.c b/bgpd/bgp_fsm.c index ae214859d7..b570c84d8b 100644 --- a/bgpd/bgp_fsm.c +++ b/bgpd/bgp_fsm.c @@ -194,7 +194,7 @@ static struct peer *peer_xfer_conn(struct peer *from_peer) * on various buffers. Those need to be transferred or dropped, * otherwise we'll get spurious failures during session establishment. */ - frr_with_mutex(&peer->io_mtx, &from_peer->io_mtx) { + frr_with_mutex (&peer->io_mtx, &from_peer->io_mtx) { fd = peer->fd; peer->fd = from_peer->fd; from_peer->fd = fd; @@ -1500,7 +1500,7 @@ int bgp_stop(struct peer *peer) THREAD_OFF(peer->t_delayopen); /* Clear input and output buffer. */ - frr_with_mutex(&peer->io_mtx) { + frr_with_mutex (&peer->io_mtx) { if (peer->ibuf) stream_fifo_clean(peer->ibuf); if (peer->obuf) diff --git a/bgpd/bgp_io.c b/bgpd/bgp_io.c index 75d34a84e0..aba28fa504 100644 --- a/bgpd/bgp_io.c +++ b/bgpd/bgp_io.c @@ -134,7 +134,7 @@ static void bgp_process_writes(struct thread *thread) struct frr_pthread *fpt = bgp_pth_io; - frr_with_mutex(&peer->io_mtx) { + frr_with_mutex (&peer->io_mtx) { status = bgp_write(peer); reschedule = (stream_fifo_head(peer->obuf) != NULL); } @@ -188,7 +188,7 @@ static void bgp_process_reads(struct thread *thread) struct frr_pthread *fpt = bgp_pth_io; - frr_with_mutex(&peer->io_mtx) { + frr_with_mutex (&peer->io_mtx) { status = bgp_read(peer, &code); } @@ -247,7 +247,7 @@ static void bgp_process_reads(struct thread *thread) stream_set_endp(pkt, pktsize); frrtrace(2, frr_bgp, packet_read, peer, pkt); - frr_with_mutex(&peer->io_mtx) { + frr_with_mutex (&peer->io_mtx) { stream_fifo_push(peer->ibuf, pkt); } diff --git a/bgpd/bgp_keepalives.c b/bgpd/bgp_keepalives.c index 86202a0e3d..158f163358 100644 --- a/bgpd/bgp_keepalives.c +++ b/bgpd/bgp_keepalives.c @@ -252,7 +252,7 @@ void bgp_keepalives_on(struct peer *peer) */ assert(peerhash_mtx); - frr_with_mutex(peerhash_mtx) { + frr_with_mutex (peerhash_mtx) { holder.peer = peer; if (!hash_lookup(peerhash, &holder)) { struct pkat *pkat = pkat_new(peer); @@ -280,7 +280,7 @@ void bgp_keepalives_off(struct peer *peer) */ assert(peerhash_mtx); - frr_with_mutex(peerhash_mtx) { + frr_with_mutex (peerhash_mtx) { holder.peer = peer; struct pkat *res = hash_release(peerhash, &holder); if (res) { @@ -293,7 +293,7 @@ void bgp_keepalives_off(struct peer *peer) void bgp_keepalives_wake(void) { - frr_with_mutex(peerhash_mtx) { + frr_with_mutex (peerhash_mtx) { pthread_cond_signal(peerhash_cond); } } diff --git a/bgpd/bgp_packet.c b/bgpd/bgp_packet.c index 96488922ea..dbf6c0b2e9 100644 --- a/bgpd/bgp_packet.c +++ b/bgpd/bgp_packet.c @@ -125,7 +125,7 @@ static void bgp_packet_add(struct peer *peer, struct stream *s) intmax_t delta; uint32_t holdtime; - frr_with_mutex(&peer->io_mtx) { + frr_with_mutex (&peer->io_mtx) { /* if the queue is empty, reset the "last OK" timestamp to * now, otherwise if we write another packet immediately * after it'll get confused @@ -2776,7 +2776,7 @@ void bgp_process_packet(struct thread *thread) bgp_size_t size; char notify_data_length[2]; - frr_with_mutex(&peer->io_mtx) { + frr_with_mutex (&peer->io_mtx) { peer->curr = stream_fifo_pop(peer->ibuf); } @@ -2903,7 +2903,7 @@ void bgp_process_packet(struct thread *thread) if (fsm_update_result != FSM_PEER_TRANSFERRED && fsm_update_result != FSM_PEER_STOPPED) { - frr_with_mutex(&peer->io_mtx) { + frr_with_mutex (&peer->io_mtx) { // more work to do, come back later if (peer->ibuf->count > 0) thread_add_event( diff --git a/bgpd/rfapi/rfapi.c b/bgpd/rfapi/rfapi.c index f0e68d7f3f..24746d99d3 100644 --- a/bgpd/rfapi/rfapi.c +++ b/bgpd/rfapi/rfapi.c @@ -1258,7 +1258,7 @@ static int rfapi_open_inner(struct rfapi_descriptor *rfd, struct bgp *bgp, * since this peer is not on the I/O thread, this lock is not strictly * necessary, but serves as a reminder to those who may meddle... */ - frr_with_mutex(&rfd->peer->io_mtx) { + frr_with_mutex (&rfd->peer->io_mtx) { // we don't need any I/O related facilities if (rfd->peer->ibuf) stream_fifo_free(rfd->peer->ibuf); diff --git a/bgpd/rfapi/vnc_zebra.c b/bgpd/rfapi/vnc_zebra.c index 293f88d1df..fe818987b8 100644 --- a/bgpd/rfapi/vnc_zebra.c +++ b/bgpd/rfapi/vnc_zebra.c @@ -193,7 +193,7 @@ static void vnc_redistribute_add(struct prefix *p, uint32_t metric, * is not strictly necessary, but serves as a reminder * to those who may meddle... */ - frr_with_mutex(&vncHD1VR.peer->io_mtx) { + frr_with_mutex (&vncHD1VR.peer->io_mtx) { // we don't need any I/O related facilities if (vncHD1VR.peer->ibuf) stream_fifo_free(vncHD1VR.peer->ibuf); |