svn commit: r215601 - stable/7/sys/opencrypto

[Marius Strobl]

Author: marius
Date: Sun Nov 21 00:50:31 2010
New Revision: 215601
URL: http://svn.freebsd.org/changeset/base/215601

Log:
  MFC: r215295
  
  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.

Modified:
  stable/7/sys/opencrypto/cryptosoft.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/opencrypto/cryptosoft.c
==============================================================================
--- stable/7/sys/opencrypto/cryptosoft.c	Sun Nov 21 00:50:29 2010	(r215600)
+++ stable/7/sys/opencrypto/cryptosoft.c	Sun Nov 21 00:50:31 2010	(r215601)
@@ -1003,7 +1003,7 @@ swcr_identify(device_t *dev, 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");
 }
 
@@ -1011,7 +1011,7 @@ static int
 swcr_probe(device_t dev)
 {
 	device_set_desc(dev, "software crypto");
-	return (0);
+	return (BUS_PROBE_NOWILDCARD);
 }
 
 static int