summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authort00fcxen <t00fcxen@9df1edf5-d72c-5b5f-11c0-5f5209eb73f7>2014-04-01 19:09:59 +0000
committert00fcxen <t00fcxen@9df1edf5-d72c-5b5f-11c0-5f5209eb73f7>2014-04-01 19:09:59 +0000
commitf93719bdbc17ab6326f983e582dbda6035e39c68 (patch)
treeed3ce6f86ccc303966eda8853db182d7adf322e3
parent368d86efa422ae7e549399f8c35783c0e80232f0 (diff)
downloadusrsctplib-f93719bdbc17ab6326f983e582dbda6035e39c68.tar.gz
Syn with Mavericks sources.
git-svn-id: http://sctp-refimpl.googlecode.com/svn/trunk/KERN/usrsctp/usrsctplib@8842 9df1edf5-d72c-5b5f-11c0-5f5209eb73f7
-rwxr-xr-xnetinet/sctp_output.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/netinet/sctp_output.c b/netinet/sctp_output.c
index 46ca9d7..72f6bc3 100755
--- a/netinet/sctp_output.c
+++ b/netinet/sctp_output.c
@@ -32,7 +32,7 @@
#ifdef __FreeBSD__
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/netinet/sctp_output.c 263237 2014-03-16 12:32:16Z tuexen $");
+__FBSDID("$FreeBSD: head/sys/netinet/sctp_output.c 264017 2014-04-01 18:38:04Z tuexen $");
#endif
#include <netinet/sctp_os.h>
@@ -7745,7 +7745,8 @@ re_look:
chk->pad_inplace = 0;
chk->no_fr_allowed = 0;
chk->rec.data.stream_seq = strq->next_sequence_send;
- if (rcv_flags & SCTP_DATA_LAST_FRAG) {
+ if ((rcv_flags & SCTP_DATA_LAST_FRAG) &&
+ !(rcv_flags & SCTP_DATA_UNORDERED)) {
strq->next_sequence_send++;
}
chk->rec.data.stream_number = sp->stream;