diff options
author | tuexen <tuexen@FreeBSD.org> | 2012-11-07 21:25:32 +0000 |
---|---|---|
committer | tuexen <tuexen@FreeBSD.org> | 2012-11-07 21:25:32 +0000 |
commit | 7e9001b55aa35989ccd20045caaaf41d7ad03f5a (patch) | |
tree | b845fd0f29b4b4fb05788c05230b0ac73b69b3dd /sys/netinet/sctp_indata.c | |
parent | 5e2e6e07537790166e0b1b09b9ddaa0ea66b9004 (diff) | |
download | FreeBSD-src-7e9001b55aa35989ccd20045caaaf41d7ad03f5a.zip FreeBSD-src-7e9001b55aa35989ccd20045caaaf41d7ad03f5a.tar.gz |
Add some missing changes missed in the last commit.
MFC after: 1 week
X-MFC with: 242708
Diffstat (limited to 'sys/netinet/sctp_indata.c')
-rw-r--r-- | sys/netinet/sctp_indata.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/netinet/sctp_indata.c b/sys/netinet/sctp_indata.c index c827da1..558238c 100644 --- a/sys/netinet/sctp_indata.c +++ b/sys/netinet/sctp_indata.c @@ -2975,9 +2975,10 @@ sctp_process_segment_range(struct sctp_tcb *stcb, struct sctp_tmit_chunk **p_tp1 * All chunks NOT UNSENT fall through here and are marked * (leave PR-SCTP ones that are to skip alone though) */ - if (tp1->sent != SCTP_FORWARD_TSN_SKIP) + if ((tp1->sent != SCTP_FORWARD_TSN_SKIP) && + (tp1->sent != SCTP_DATAGRAM_NR_MARKED)) { tp1->sent = SCTP_DATAGRAM_MARKED; - + } if (tp1->rec.data.chunk_was_revoked) { /* deflate the cwnd */ tp1->whoTo->cwnd -= tp1->book_size; @@ -3607,7 +3608,8 @@ sctp_try_advance_peer_ack_point(struct sctp_tcb *stcb, break; } if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_LOG_TRY_ADVANCE) { - if (tp1->sent == SCTP_FORWARD_TSN_SKIP) { + if ((tp1->sent == SCTP_FORWARD_TSN_SKIP) || + (tp1->sent == SCTP_DATAGRAM_NR_MARKED)) { sctp_misc_ints(SCTP_FWD_TSN_CHECK, asoc->advanced_peer_ack_point, tp1->rec.data.TSN_seq, 0, 0); |