aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2017-03-18 16:03:43 +0100
committerAnders Broman <a.broman58@gmail.com>2017-04-11 05:33:25 +0000
commit4eed07af89716db99203d4afd9a3c20232a990af (patch)
treee6f5100838ffd031302fe46181188e68d3062203
parenta265283f12c2354ff9b84f877142b176212856a2 (diff)
sctp: fix this condition has identical branches [-Werror=duplicated-branches] found by gcc7
Change-Id: Ia2cca91f03f312b0163848917f04bb5e17baf876 Reviewed-on: https://code.wireshark.org/review/20692 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rw-r--r--epan/dissectors/packet-sctp.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/epan/dissectors/packet-sctp.c b/epan/dissectors/packet-sctp.c
index 1004992fc9..7b150a5ba6 100644
--- a/epan/dissectors/packet-sctp.c
+++ b/epan/dissectors/packet-sctp.c
@@ -1374,11 +1374,7 @@ sctp_ack_block(packet_info *pinfo, sctp_half_assoc_t *h, tvbuff_t *tvb,
for(;t;t = t->next) {
guint32 tsn = t->tsn;
- if ( tsn < h->peer->first_tsn ) {
- tsn += (0xffffffff - (h->peer->first_tsn)) + 1;
- } else {
- tsn -= h->peer->first_tsn;
- }
+ tsn -= h->peer->first_tsn;
if (t->ack.framenum == framenum && ( (!tsn_start_ptr) || rel_start <= tsn) && tsn <= rel_end)
ack_tree(t, acks_tree, tvb, pinfo);