netns xfrm: fix "ip xfrm state|policy count" misreport

[safe/jmp/linux-2.6] / crypto / twofish.c

diff --git a/crypto/twofish.c b/crypto/twofish.c
index e3b3a0a..dfcda23 100644 (file)
--- a/crypto/twofish.c
+++ b/crypto/twofish.c
@@ -181,6 +181,8 @@ static void twofish_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)
 
 static struct crypto_alg alg = {
        .cra_name           =   "twofish",
+       .cra_driver_name    =   "twofish-generic",
+       .cra_priority       =   100,
        .cra_flags          =   CRYPTO_ALG_TYPE_CIPHER,
        .cra_blocksize      =   TF_BLOCK_SIZE,
        .cra_ctxsize        =   sizeof(struct twofish_ctx),
@@ -195,18 +197,18 @@ static struct crypto_alg alg = {
        .cia_decrypt        =   twofish_decrypt } }
 };
 
-static int __init init(void)
+static int __init twofish_mod_init(void)
 {
        return crypto_register_alg(&alg);
 }
 
-static void __exit fini(void)
+static void __exit twofish_mod_fini(void)
 {
        crypto_unregister_alg(&alg);
 }
 
-module_init(init);
-module_exit(fini);
+module_init(twofish_mod_init);
+module_exit(twofish_mod_fini);
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION ("Twofish Cipher Algorithm");