From owner-svn-src-all@FreeBSD.ORG  Mon Oct 10 13:26:53 2011
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 609B3106566C;
	Mon, 10 Oct 2011 13:26:53 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 50B7A8FC17;
	Mon, 10 Oct 2011 13:26:53 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p9ADQrZS062214;
	Mon, 10 Oct 2011 13:26:53 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9ADQrA4062212;
	Mon, 10 Oct 2011 13:26:53 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201110101326.p9ADQrA4062212@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Mon, 10 Oct 2011 13:26:53 +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: r226208 - head/sys/dev/iscsi/initiator
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: Mon, 10 Oct 2011 13:26:53 -0000

Author: kib
Date: Mon Oct 10 13:26:53 2011
New Revision: 226208
URL: http://svn.freebsd.org/changeset/base/226208

Log:
  Do not ignore block offsets.
  
  PR:	kern/160943
  Submitted by:	Craig Boston <cb severious net>
  Reviewed by:	Danny Braniss <danny cs huji ac il>
  MFC after:	1 week

Modified:
  head/sys/dev/iscsi/initiator/iscsi_subr.c

Modified: head/sys/dev/iscsi/initiator/iscsi_subr.c
==============================================================================
--- head/sys/dev/iscsi/initiator/iscsi_subr.c	Mon Oct 10 13:18:55 2011	(r226207)
+++ head/sys/dev/iscsi/initiator/iscsi_subr.c	Mon Oct 10 13:26:53 2011	(r226208)
@@ -84,6 +84,7 @@ iscsi_r2t(isc_session_t *sp, pduq_t *opq
 	       caddr_t		bp = csio->data_ptr;
 
 	       bo = ntohl(r2t->bo);
+	       bp += MIN(bo, edtl - ddtl);
 	       bleft = ddtl;
 
 	       if(sp->opt.maxXmitDataSegmentLength > 0) // danny's RFC