From owner-svn-src-all@FreeBSD.ORG  Mon Feb 27 17:29:44 2012
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 AC16F106577F;
	Mon, 27 Feb 2012 17:29:43 +0000 (UTC)
	(envelope-from sbruno@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 354FF8FC15;
	Mon, 27 Feb 2012 17:29:43 +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 q1RHTgOT029040;
	Mon, 27 Feb 2012 17:29:42 GMT (envelope-from sbruno@svn.freebsd.org)
Received: (from sbruno@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1RHTgBj029038;
	Mon, 27 Feb 2012 17:29:42 GMT (envelope-from sbruno@svn.freebsd.org)
Message-Id: <201202271729.q1RHTgBj029038@svn.freebsd.org>
From: Sean Bruno <sbruno@FreeBSD.org>
Date: Mon, 27 Feb 2012 17:29:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r232229 - stable/9/sys/dev/isci
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, 27 Feb 2012 17:29:44 -0000

Author: sbruno
Date: Mon Feb 27 17:29:42 2012
New Revision: 232229
URL: http://svn.freebsd.org/changeset/base/232229

Log:
  MFC r231860
  
  During work to port isci(4) to stable/7 I noted that the maxio portion of
  struct ccb_pathinq from sys/cam/cam_ccb.h wasn't added to stable/7 at all
  and didn't appear in stable/8 until svn R195534.  Since __FreeBSD_version
  did not get bumped until svn R195634, assume that maxio is valid at 800102
  or higher.
  
  Obtained from:	Yahoo! Inc.

Modified:
  stable/9/sys/dev/isci/isci_controller.c

Modified: stable/9/sys/dev/isci/isci_controller.c
==============================================================================
--- stable/9/sys/dev/isci/isci_controller.c	Mon Feb 27 17:29:37 2012	(r232228)
+++ stable/9/sys/dev/isci/isci_controller.c	Mon Feb 27 17:29:42 2012	(r232229)
@@ -549,7 +549,7 @@ void isci_action(struct cam_sim *sim, un
 			cpi->hba_eng_cnt = 0;
 			cpi->max_target = SCI_MAX_REMOTE_DEVICES - 1;
 			cpi->max_lun = ISCI_MAX_LUN;
-#if __FreeBSD_version >= 704100
+#if __FreeBSD_version >= 800102
 			cpi->maxio = isci_io_request_get_max_io_size();
 #endif
 			cpi->unit_number = cam_sim_unit(sim);