Author: tuexen
Date: Wed Nov 7 21:25:32 2012
New Revision: 242709
URL: http://svnweb.freebsd.org/changeset/base/242709
Log:
Add some missing changes missed in the last commit.
MFC after: 1 week
X-MFC with: 242708
Modified:
head/sys/netinet/sctp_indata.c
head/sys/netinet/sctp_output.c
Modified: head/sys/netinet/sctp_indata.c
==============================================================================
--- head/sys/netinet/sctp_indata.c Wed Nov 7 20:59:00 2012
(r242708)
+++ head/sys/netinet/sctp_indata.c Wed Nov 7 21:25:32 2012
(r242709)
@@ -2975,9 +2975,10 @@ sctp_process_segment_range(struct sctp_t
* 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 s
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);
Modified: head/sys/netinet/sctp_output.c
==============================================================================
--- head/sys/netinet/sctp_output.c Wed Nov 7 20:59:00 2012
(r242708)
+++ head/sys/netinet/sctp_output.c Wed Nov 7 21:25:32 2012
(r242709)
@@ -10152,7 +10152,8 @@ sctp_fill_in_rest:
unsigned int cnt_of_skipped = 0;
TAILQ_FOREACH(at, &asoc->sent_queue, sctp_next) {
- if (at->sent != SCTP_FORWARD_TSN_SKIP) {
+ if ((at->sent != SCTP_FORWARD_TSN_SKIP) &&
+ (at->sent != SCTP_DATAGRAM_NR_MARKED)) {
/* no more to look at */
break;
}
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
