From owner-svn-src-stable-9@FreeBSD.ORG  Wed Oct  9 18:44:05 2013
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id C134BE31;
 Wed,  9 Oct 2013 18:44:05 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id AE36B2C8E;
 Wed,  9 Oct 2013 18:44:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r99Ii57l053926;
 Wed, 9 Oct 2013 18:44:05 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r99Ii5Pu053925;
 Wed, 9 Oct 2013 18:44:05 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201310091844.r99Ii5Pu053925@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Wed, 9 Oct 2013 18:44:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r256212 - stable/9/sys/cam/ctl
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Oct 2013 18:44:05 -0000

Author: mav
Date: Wed Oct  9 18:44:05 2013
New Revision: 256212
URL: http://svnweb.freebsd.org/changeset/base/256212

Log:
  MFC r249102 (by trasz):
  Since the CTL version in FreeBSD does not support High Availability,
  ctl_is_single should always be set to 1.  Make it so.  Previously
  it was always 0, because ctl_isc_start() never got to run.

Modified:
  stable/9/sys/cam/ctl/ctl.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/cam/ctl/ctl.c
==============================================================================
--- stable/9/sys/cam/ctl/ctl.c	Wed Oct  9 18:43:29 2013	(r256211)
+++ stable/9/sys/cam/ctl/ctl.c	Wed Oct  9 18:44:05 2013	(r256212)
@@ -316,7 +316,7 @@ static struct scsi_control_page control_
 static int rcv_sync_msg;
 static int persis_offset;
 static uint8_t ctl_pause_rtr;
-static int     ctl_is_single;
+static int     ctl_is_single = 1;
 static int     index_to_aps_page;
 int	   ctl_disable = 0;