From owner-svn-src-head@FreeBSD.ORG  Sun Nov 14 13:09:33 2010
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3494610656AB;
	Sun, 14 Nov 2010 13:09:33 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 21EDC8FC17;
	Sun, 14 Nov 2010 13:09:33 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oAED9Xet082721;
	Sun, 14 Nov 2010 13:09:33 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAED9Xcv082719;
	Sun, 14 Nov 2010 13:09:33 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201011141309.oAED9Xcv082719@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Sun, 14 Nov 2010 13:09:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r215295 - head/sys/opencrypto
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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, 14 Nov 2010 13:09:33 -0000

Author: marius
Date: Sun Nov 14 13:09:32 2010
New Revision: 215295
URL: http://svn.freebsd.org/changeset/base/215295

Log:
  Let cryptosoft(4) add its pseudo-device with a specific unit number and its
  probe method return BUS_PROBE_NOWILDCARD so it doesn't get attached to real
  devices hanging off of nexus(4) with no specific devclass set. Actually, the
  more desirable fix for this would be to get rid of the newbus interface of
  cryptosoft(4) altogether but apparently crypto(9) was written with support
  for cryptographic hardware in mind so that approach would require some KPI
  breaking changes which don't seem worth it.
  
  MFC after:	1 week

Modified:
  head/sys/opencrypto/cryptosoft.c

Modified: head/sys/opencrypto/cryptosoft.c
==============================================================================
--- head/sys/opencrypto/cryptosoft.c	Sun Nov 14 13:06:34 2010	(r215294)
+++ head/sys/opencrypto/cryptosoft.c	Sun Nov 14 13:09:32 2010	(r215295)
@@ -1060,7 +1060,7 @@ swcr_identify(driver_t *drv, device_t pa
 {
 	/* NB: order 10 is so we get attached after h/w devices */
 	if (device_find_child(parent, "cryptosoft", -1) == NULL &&
-	    BUS_ADD_CHILD(parent, 10, "cryptosoft", -1) == 0)
+	    BUS_ADD_CHILD(parent, 10, "cryptosoft", 0) == 0)
 		panic("cryptosoft: could not attach");
 }
 
@@ -1068,7 +1068,7 @@ static int
 swcr_probe(device_t dev)
 {
 	device_set_desc(dev, "software crypto");
-	return (0);
+	return (BUS_PROBE_NOWILDCARD);
 }
 
 static int