From owner-svn-src-all@FreeBSD.ORG  Wed Jun  9 16:39:18 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CEB9F1065679;
	Wed,  9 Jun 2010 16:39:18 +0000 (UTC) (envelope-from rrs@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BEC2E8FC25;
	Wed,  9 Jun 2010 16:39:18 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o59GdI7Z078004;
	Wed, 9 Jun 2010 16:39:18 GMT (envelope-from rrs@svn.freebsd.org)
Received: (from rrs@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o59GdIwE078003;
	Wed, 9 Jun 2010 16:39:18 GMT (envelope-from rrs@svn.freebsd.org)
Message-Id: <201006091639.o59GdIwE078003@svn.freebsd.org>
From: Randall Stewart <rrs@FreeBSD.org>
Date: Wed, 9 Jun 2010 16:39:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r208952 - head/sys/netinet
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Jun 2010 16:39:18 -0000

Author: rrs
Date: Wed Jun  9 16:39:18 2010
New Revision: 208952
URL: http://svn.freebsd.org/changeset/base/208952

Log:
  BUG:Turns out we need to use both bit maps
  to calculate the cum-ack (we were not doing
  it for the NR-Sack case). With this fix
  NR-sack should now work correctly.
  MFC after:	1 week

Modified:
  head/sys/netinet/sctp_indata.c

Modified: head/sys/netinet/sctp_indata.c
==============================================================================
--- head/sys/netinet/sctp_indata.c	Wed Jun  9 15:29:12 2010	(r208951)
+++ head/sys/netinet/sctp_indata.c	Wed Jun  9 16:39:18 2010	(r208952)
@@ -2267,7 +2267,6 @@ sctp_slide_mapping_arrays(struct sctp_tc
 	uint8_t val;
 	int slide_from, slide_end, lgap, distance;
 	uint32_t old_cumack, old_base, old_highest, highest_tsn;
-	int type;
 
 	asoc = &stcb->asoc;
 	at = 0;
@@ -2279,18 +2278,9 @@ sctp_slide_mapping_arrays(struct sctp_tc
 	 * We could probably improve this a small bit by calculating the
 	 * offset of the current cum-ack as the starting point.
 	 */
-	if (SCTP_BASE_SYSCTL(sctp_nr_sack_on_off) &&
-	    stcb->asoc.peer_supports_nr_sack) {
-		type = SCTP_NR_SELECTIVE_ACK;
-	} else {
-		type = SCTP_SELECTIVE_ACK;
-	}
 	at = 0;
 	for (slide_from = 0; slide_from < stcb->asoc.mapping_array_size; slide_from++) {
-		if (type == SCTP_NR_SELECTIVE_ACK)
-			val = asoc->nr_mapping_array[slide_from];
-		else
-			val = asoc->nr_mapping_array[slide_from] | asoc->mapping_array[slide_from];
+		val = asoc->nr_mapping_array[slide_from] | asoc->mapping_array[slide_from];
 		if (val == 0xff) {
 			at += 8;
 		} else {