From owner-svn-src-all@FreeBSD.ORG  Fri Nov 11 01:37:49 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 191071065670;
	Fri, 11 Nov 2011 01:37:49 +0000 (UTC)
	(envelope-from rstone@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 08A838FC13;
	Fri, 11 Nov 2011 01:37:49 +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 pAB1bmdj064953;
	Fri, 11 Nov 2011 01:37:48 GMT (envelope-from rstone@svn.freebsd.org)
Received: (from rstone@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pAB1bmvi064951;
	Fri, 11 Nov 2011 01:37:48 GMT (envelope-from rstone@svn.freebsd.org)
Message-Id: <201111110137.pAB1bmvi064951@svn.freebsd.org>
From: Ryan Stone <rstone@FreeBSD.org>
Date: Fri, 11 Nov 2011 01:37:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r227436 - stable/8/sbin/camcontrol
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: Fri, 11 Nov 2011 01:37:49 -0000

Author: rstone
Date: Fri Nov 11 01:37:48 2011
New Revision: 227436
URL: http://svn.freebsd.org/changeset/base/227436

Log:
  MFC 215507:
  
   When doing a camcontrol rescan all or a camcontrol reset all, use the wildcard
   path id for enumerating the available busses.  Previously camcontrol was
   implicitly passing 0 as the first path id, which meant that if bus 0 was not
   present camcontrol would fail with EINVAL instead of rescanning/resetting any
   busses that were present.

Modified:
  stable/8/sbin/camcontrol/camcontrol.c
Directory Properties:
  stable/8/sbin/camcontrol/   (props changed)

Modified: stable/8/sbin/camcontrol/camcontrol.c
==============================================================================
--- stable/8/sbin/camcontrol/camcontrol.c	Fri Nov 11 01:35:07 2011	(r227435)
+++ stable/8/sbin/camcontrol/camcontrol.c	Fri Nov 11 01:37:48 2011	(r227436)
@@ -1526,6 +1526,7 @@ rescan_or_reset_bus(int bus, int rescan)
 	bzero(&(&matchccb.ccb_h)[1],
 	      sizeof(struct ccb_dev_match) - sizeof(struct ccb_hdr));
 	matchccb.ccb_h.func_code = XPT_DEV_MATCH;
+	matchccb.ccb_h.path_id = CAM_BUS_WILDCARD;
 	bufsize = sizeof(struct dev_match_result) * 20;
 	matchccb.cdm.match_buf_len = bufsize;
 	matchccb.cdm.matches=(struct dev_match_result *)malloc(bufsize);