From owner-svn-src-stable-10@FreeBSD.ORG Sun Jun 22 16:34:28 2014
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 53246FFE;
Sun, 22 Jun 2014 16:34:28 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 405A622E5;
Sun, 22 Jun 2014 16:34:28 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5MGYSXX039552;
Sun, 22 Jun 2014 16:34:28 GMT (envelope-from tuexen@svn.freebsd.org)
Received: (from tuexen@localhost)
by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5MGYS0F039551;
Sun, 22 Jun 2014 16:34:28 GMT (envelope-from tuexen@svn.freebsd.org)
Message-Id: <201406221634.s5MGYS0F039551@svn.freebsd.org>
From: Michael Tuexen <tuexen@FreeBSD.org>
Date: Sun, 22 Jun 2014 16:34:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r267726 - stable/10/sys/netinet
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
<svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>,
<mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>,
<mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Jun 2014 16:34:28 -0000
Author: tuexen
Date: Sun Jun 22 16:34:27 2014
New Revision: 267726
URL: http://svnweb.freebsd.org/changeset/base/267726
Log:
MFC r264017:
Increment the SSN only after processing the last fragment of an
ordered user message.
Modified:
stable/10/sys/netinet/sctp_output.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/netinet/sctp_output.c
==============================================================================
--- stable/10/sys/netinet/sctp_output.c Sun Jun 22 16:32:41 2014 (r267725)
+++ stable/10/sys/netinet/sctp_output.c Sun Jun 22 16:34:27 2014 (r267726)
@@ -7367,7 +7367,8 @@ dont_do_it:
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;