From owner-p4-projects@FreeBSD.ORG  Tue Dec  5 04:57:22 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F2BDA16A417; Tue,  5 Dec 2006 04:57:21 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id C8BF916A415
	for <perforce@freebsd.org>; Tue,  5 Dec 2006 04:57:21 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9674143CA6
	for <perforce@freebsd.org>; Tue,  5 Dec 2006 04:56:44 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB54vLp6060202
	for <perforce@freebsd.org>; Tue, 5 Dec 2006 04:57:21 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB54vLIa060199
	for perforce@freebsd.org; Tue, 5 Dec 2006 04:57:21 GMT
	(envelope-from sam@freebsd.org)
Date: Tue, 5 Dec 2006 04:57:21 GMT
Message-Id: <200612050457.kB54vLIa060199@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 111110 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Dec 2006 04:57:22 -0000

http://perforce.freebsd.org/chv.cgi?CH=111110

Change 111110 by sam@sam_ebb on 2006/12/05 04:56:39

	whitespace changes to reduce diffs against uncommitted work

Affected files ...

.. //depot/projects/crypto/sys/opencrypto/crypto.c#6 edit

Differences ...

==== //depot/projects/crypto/sys/opencrypto/crypto.c#6 (text+ko) ====

@@ -720,7 +720,6 @@
 	int i, err;
 
 	CRYPTO_DRIVER_LOCK();
-
 	cap = crypto_checkdriver(driverid);
 	if (cap != NULL &&
 	    (CRYPTO_ALGORITHM_MIN <= alg && alg <= CRYPTO_ALGORITHM_MAX) &&
@@ -738,8 +737,8 @@
 		err = 0;
 	} else
 		err = EINVAL;
+	CRYPTO_DRIVER_UNLOCK();
 
-	CRYPTO_DRIVER_UNLOCK();
 	return err;
 }
 
@@ -757,15 +756,14 @@
 	int err;
 
 	CRYPTO_DRIVER_LOCK();
-
 	cap = crypto_checkdriver(driverid);
 	if (cap != NULL) {
 		driver_finis(cap);
 		err = 0;
 	} else
 		err = EINVAL;
+	CRYPTO_DRIVER_UNLOCK();
 
-	CRYPTO_DRIVER_UNLOCK();
 	return err;
 }
 
@@ -849,20 +847,20 @@
 int
 crypto_kdispatch(struct cryptkop *krp)
 {
-	int result;
+	int error;
 
 	cryptostats.cs_kops++;
 
-	result = crypto_kinvoke(krp, krp->krp_crid);
-	if (result != ERESTART)
-		return (result);
-	CRYPTO_Q_LOCK();
-	TAILQ_INSERT_TAIL(&crp_kq, krp, krp_next);
-	if (crp_sleep)
-		wakeup_one(&crp_q);
-	CRYPTO_Q_UNLOCK();
-
-	return 0;
+	error = crypto_kinvoke(krp, krp->krp_crid);
+	if (error == ERESTART) {
+		CRYPTO_Q_LOCK();
+		TAILQ_INSERT_TAIL(&crp_kq, krp, krp_next);
+		if (crp_sleep)
+			wakeup_one(&crp_q);
+		CRYPTO_Q_UNLOCK();
+		error = 0;
+	}
+	return error;
 }
 
 /*
@@ -1222,13 +1220,14 @@
 
 	CRYPTO_DRIVER_LOCK();
 	for (hid = 0; hid < crypto_drivers_num; hid++) {
-		if ((crypto_drivers[hid].cc_flags & CRYPTOCAP_F_SOFTWARE) &&
+		const struct cryptocap *cap = &crypto_drivers[hid];
+
+		if ((cap->cc_flags & CRYPTOCAP_F_SOFTWARE) &&
 		    !crypto_devallowsoft) {
 			continue;
 		}
 		for (kalg = 0; kalg < CRK_ALGORITHM_MAX; kalg++)
-			if ((crypto_drivers[hid].cc_kalg[kalg] &
-			    CRYPTO_ALG_FLAG_SUPPORTED) != 0)
+			if (cap->cc_kalg[kalg] & CRYPTO_ALG_FLAG_SUPPORTED)
 				feat |=  1 << kalg;
 	}
 	CRYPTO_DRIVER_UNLOCK();