diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2017-07-22 14:52:33 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2017-07-22 14:52:33 +0200 |
| commit | 9d303b37d73b8fe2bef310d8d9ca1acad23c2501 (patch) | |
| tree | bbe78c595bd8f42b76322df2a37cf81f60c08a6a /bgpd/bgp_updgrp_packet.c | |
| parent | *: add git-reindent-branch.py (diff) | |
| download | frr-9d303b37d73b8fe2bef310d8d9ca1acad23c2501.tar.xz frr-9d303b37d73b8fe2bef310d8d9ca1acad23c2501.zip | |
Revert "*: reindent pt. 2"
This reverts commit c14777c6bfd0a446c85243d3a9835054a259c276.
clang 5 is not widely available enough for people to indent with. This
is particularly problematic when rebasing/adjusting branches.
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'bgpd/bgp_updgrp_packet.c')
| -rw-r--r-- | bgpd/bgp_updgrp_packet.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/bgpd/bgp_updgrp_packet.c b/bgpd/bgp_updgrp_packet.c index 53d695167..d7a4a3698 100644 --- a/bgpd/bgp_updgrp_packet.c +++ b/bgpd/bgp_updgrp_packet.c @@ -732,9 +732,8 @@ struct bpacket *subgroup_update_packet(struct update_subgroup *subgrp) space_remaining = STREAM_CONCAT_REMAIN(s, snlri, STREAM_SIZE(s)) - BGP_MAX_PACKET_SIZE_OVERFLOW; - space_needed = - BGP_NLRI_LENGTH - + bgp_packet_mpattr_prefix_size(afi, safi, &rn->p); + space_needed = BGP_NLRI_LENGTH + bgp_packet_mpattr_prefix_size( + afi, safi, &rn->p); /* When remaining space can't include NLRI and it's length. */ if (space_remaining < space_needed) @@ -778,9 +777,9 @@ struct bpacket *subgroup_update_packet(struct update_subgroup *subgrp) space_remaining = STREAM_CONCAT_REMAIN(s, snlri, STREAM_SIZE(s)) - BGP_MAX_PACKET_SIZE_OVERFLOW; - space_needed = BGP_NLRI_LENGTH - + bgp_packet_mpattr_prefix_size( - afi, safi, &rn->p); + space_needed = + BGP_NLRI_LENGTH + bgp_packet_mpattr_prefix_size( + afi, safi, &rn->p); /* If the attributes alone do not leave any room for * NLRI then |