diff options
| author | Quentin Young <qlyoung@cumulusnetworks.com> | 2020-01-31 19:04:00 +0100 |
|---|---|---|
| committer | Quentin Young <qlyoung@cumulusnetworks.com> | 2020-02-04 21:19:04 +0100 |
| commit | 362353195a9df13776a1999113720542f1bd8a14 (patch) | |
| tree | 8c403ef53cdfe43d17d8006046d2afeb97b814d4 /bgpd/bgp_network.c | |
| parent | bgpd: use _RO list iter variant for gr macro (diff) | |
| download | frr-362353195a9df13776a1999113720542f1bd8a14.tar.xz frr-362353195a9df13776a1999113720542f1bd8a14.zip | |
bgpd, lib: fix style from BGP GR code
This patch fixes the noncompliant style for the following commit range:
4a6e80fbf
2ba1fe695
efcb2ebbb
8c48b3b69
dc95985fe
0f0444fbd
85ef4179a
eb451ee58
2d3dd828d
9e3b51a7f
d6e3c15b6
34aa74486
6102cb7fe
d7b3cda6f
2bb5d39b1
5f9c1aa29
5cce3f054
3a75afa4b
f009ff269
cfd47646b
2986cac29
055679e91
034e185dc
794b37d52
b0965c44e
949b0f24f
63696f1d8
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Diffstat (limited to 'bgpd/bgp_network.c')
| -rw-r--r-- | bgpd/bgp_network.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/bgpd/bgp_network.c b/bgpd/bgp_network.c index d7989af55..8b585704d 100644 --- a/bgpd/bgp_network.c +++ b/bgpd/bgp_network.c @@ -489,16 +489,14 @@ static int bgp_accept(struct thread *thread) peer_xfer_config(peer, peer1); bgp_peer_gr_flags_update(peer); - BGP_GR_ROUTER_DETECT_AND_SEND_CAPABILITY_TO_ZEBRA( - peer->bgp, - peer->bgp->peer); + BGP_GR_ROUTER_DETECT_AND_SEND_CAPABILITY_TO_ZEBRA(peer->bgp, + peer->bgp->peer); if (bgp_peer_gr_mode_get(peer) == PEER_DISABLE) { UNSET_FLAG(peer->sflags, PEER_STATUS_NSF_MODE); - if (CHECK_FLAG(peer->sflags, - PEER_STATUS_NSF_WAIT)) { + if (CHECK_FLAG(peer->sflags, PEER_STATUS_NSF_WAIT)) { peer_nsf_stop(peer); } } @@ -515,7 +513,7 @@ static int bgp_accept(struct thread *thread) SET_FLAG(peer->sflags, PEER_STATUS_ACCEPT_PEER); /* Make dummy peer until read Open packet. */ if (peer1->status == Established - && CHECK_FLAG(peer1->sflags, PEER_STATUS_NSF_MODE)) { + && CHECK_FLAG(peer1->sflags, PEER_STATUS_NSF_MODE)) { /* If we have an existing established connection with graceful * restart * capability announced with one or more address families, then @@ -524,12 +522,10 @@ static int bgp_accept(struct thread *thread) */ peer1->last_reset = PEER_DOWN_NSF_CLOSE_SESSION; - if (CHECK_FLAG(peer1->flags, - PEER_FLAG_GRACEFUL_RESTART) || - CHECK_FLAG(peer1->flags, - PEER_FLAG_GRACEFUL_RESTART_HELPER)) - SET_FLAG(peer1->sflags, - PEER_STATUS_NSF_WAIT); + if (CHECK_FLAG(peer1->flags, PEER_FLAG_GRACEFUL_RESTART) + || CHECK_FLAG(peer1->flags, + PEER_FLAG_GRACEFUL_RESTART_HELPER)) + SET_FLAG(peer1->sflags, PEER_STATUS_NSF_WAIT); bgp_event_update(peer1, TCP_connection_closed); } |