From owner-svn-src-stable@freebsd.org  Mon Mar  7 15:52:53 2016
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 02B81AC2FF1;
 Mon,  7 Mar 2016 15:52:53 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 C8025188;
 Mon,  7 Mar 2016 15:52:52 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u27Fqpo7073635;
 Mon, 7 Mar 2016 15:52:51 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u27FqpMm073634;
 Mon, 7 Mar 2016 15:52:51 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201603071552.u27FqpMm073634@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
 using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Mon, 7 Mar 2016 15:52:51 +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: r296458 - stable/10/sys/dev/firewire
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@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 07 Mar 2016 15:52:53 -0000

Author: pfg
Date: Mon Mar  7 15:52:51 2016
New Revision: 296458
URL: https://svnweb.freebsd.org/changeset/base/296458

Log:
  MFC r295810:
  firewire: fix a mismatch introduced in r230558.
  
  Found by:	PVS Static Analysis
  Reviewed by:	sbruno

Modified:
  stable/10/sys/dev/firewire/sbp_targ.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/firewire/sbp_targ.c
==============================================================================
--- stable/10/sys/dev/firewire/sbp_targ.c	Mon Mar  7 15:44:54 2016	(r296457)
+++ stable/10/sys/dev/firewire/sbp_targ.c	Mon Mar  7 15:52:51 2016	(r296458)
@@ -1327,7 +1327,7 @@ sbp_targ_action1(struct cam_sim *sim, un
 				 | PIT_DISCONNECT
 				 | PIT_TERM_IO;
 		cpi->transport = XPORT_SPI; /* FIXME add XPORT_FW type to cam */
-		cpi->hba_misc = PIM_NOBUSRESET | PIM_NOBUSRESET;
+		cpi->hba_misc = PIM_NOBUSRESET | PIM_NO_6_BYTE;
 		cpi->hba_eng_cnt = 0;
 		cpi->max_target = 7; /* XXX */
 		cpi->max_lun = MAX_LUN - 1;