From owner-svn-src-head@FreeBSD.ORG  Sun Apr 28 16:35:24 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 275878FD;
 Sun, 28 Apr 2013 16:35:24 +0000 (UTC)
 (envelope-from sbruno@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 19F231CF4;
 Sun, 28 Apr 2013 16:35:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3SGZNrY074325;
 Sun, 28 Apr 2013 16:35:23 GMT (envelope-from sbruno@svn.freebsd.org)
Received: (from sbruno@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3SGZNDC074324;
 Sun, 28 Apr 2013 16:35:23 GMT (envelope-from sbruno@svn.freebsd.org)
Message-Id: <201304281635.r3SGZNDC074324@svn.freebsd.org>
From: Sean Bruno <sbruno@FreeBSD.org>
Date: Sun, 28 Apr 2013 16:35:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r250022 - head/sys/dev/ciss
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 28 Apr 2013 16:35:24 -0000

Author: sbruno
Date: Sun Apr 28 16:35:23 2013
New Revision: 250022
URL: http://svnweb.freebsd.org/changeset/base/250022

Log:
  Let's align correctly by setting to 17.
  
  OpenCISS states that if the value is 0, then the driver should try a value
  of 31.  That's just silly.  Set to 17 so that the subtraction for maxio
  becomes 16 and aligns nicely.
  
  Reviewed by:	scottl
  Obtained from:	Yahoo! Inc.
  MFC after:	2 weeks

Modified:
  head/sys/dev/ciss/ciss.c

Modified: head/sys/dev/ciss/ciss.c
==============================================================================
--- head/sys/dev/ciss/ciss.c	Sun Apr 28 16:20:09 2013	(r250021)
+++ head/sys/dev/ciss/ciss.c	Sun Apr 28 16:35:23 2013	(r250022)
@@ -3007,7 +3007,7 @@ ciss_cam_action(struct cam_sim *sim, uni
 	cpi->protocol = PROTO_SCSI;
 	cpi->protocol_version = SCSI_REV_2;
 	if (sc->ciss_cfg->max_sg_length == 0) {
-		sg_length = 16;
+		sg_length = 17;
 	} else {
 	/* XXX Fix for ZMR cards that advertise max_sg_length == 32
 	 * Confusing bit here. max_sg_length is usually a power of 2. We always