[LV-commit] CVS: kernel-2.5/include/linux crypto.h,1.1.1.2,1.2

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/include/linux
In directory sc8-pr-cvs1:/tmp/cvs-serv24064/include/linux

Modified Files:
	crypto.h 
Log Message:
Back-port an upcoming fix from 2.5.49 to allow non-modular kernels to
compile skbuff.c


Index: crypto.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/linux/crypto.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -r1.1.1.2 -r1.2
--- crypto.h	15 Jun 2003 23:14:58 -0000	1.1.1.2
+++ crypto.h	20 Jun 2003 00:19:20 -0000	1.2
@@ -196,16 +196,12 @@
 
 static inline const char *crypto_tfm_alg_modname(struct crypto_tfm *tfm)
 {
-	struct crypto_alg *alg = tfm->__crt_alg;
-	
-	if (alg->cra_module)
-		return alg->cra_module->name;
-	else
-		return NULL;
+	return module_name(tfm->__crt_alg->cra_module);
 }
 
 static inline u32 crypto_tfm_alg_type(struct crypto_tfm *tfm)
 {
+	/* Back-port fix from 2.5.49 */
 	return tfm->__crt_alg->cra_flags & CRYPTO_ALG_TYPE_MASK;
 }