1 files changed, 17 insertions, 13 deletions

diff --git a/crypto/crc32c.c b/crypto/crc32c.c
index f2660123aeb4..0fa744392a4c 100644
--- a/crypto/crc32c.c
+++ b/crypto/crc32c.c
@@ -16,14 +16,14 @@
 #include <linux/string.h>
 #include <linux/crypto.h>
 #include <linux/crc32c.h>
-#include <linux/types.h>
-#include <asm/byteorder.h>
+#include <linux/kernel.h>
 
 #define CHKSUM_BLOCK_SIZE       32
 #define CHKSUM_DIGEST_SIZE      4
 
 struct chksum_ctx {
         u32 crc;
+        u32 key;
 };
 
 /*
@@ -35,7 +35,7 @@ static void chksum_init(struct crypto_tfm *tfm)
 {
         struct chksum_ctx *mctx = crypto_tfm_ctx(tfm);
 
-        mctx->crc = ~(u32)0;                    /* common usage */
+        mctx->crc = mctx->key;
 }
 
 /*
@@ -44,16 +44,15 @@ static void chksum_init(struct crypto_tfm *tfm)
  * the seed.
  */
 static int chksum_setkey(struct crypto_tfm *tfm, const u8 *key,
-                         unsigned int keylen, u32 *flags)
+                         unsigned int keylen)
 {
         struct chksum_ctx *mctx = crypto_tfm_ctx(tfm);
 
         if (keylen != sizeof(mctx->crc)) {
-                if (flags)
-                        *flags = CRYPTO_TFM_RES_BAD_KEY_LEN;
+                tfm->crt_flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
                 return -EINVAL;
         }
-        mctx->crc = __cpu_to_le32(*(u32 *)key);
+        mctx->key = le32_to_cpu(*(__le32 *)key);
         return 0;
 }
 
@@ -61,19 +60,23 @@ static void chksum_update(struct crypto_tfm *tfm, const u8 *data,
                           unsigned int length)
 {
         struct chksum_ctx *mctx = crypto_tfm_ctx(tfm);
-        u32 mcrc;
 
-        mcrc = crc32c(mctx->crc, data, (size_t)length);
-
-        mctx->crc = mcrc;
+        mctx->crc = crc32c(mctx->crc, data, length);
 }
 
 static void chksum_final(struct crypto_tfm *tfm, u8 *out)
 {
         struct chksum_ctx *mctx = crypto_tfm_ctx(tfm);
-        u32 mcrc = (mctx->crc ^ ~(u32)0);
         
-        *(u32 *)out = __le32_to_cpu(mcrc);
+        *(__le32 *)out = ~cpu_to_le32(mctx->crc);
+}
+
+static int crc32c_cra_init(struct crypto_tfm *tfm)
+{
+        struct chksum_ctx *mctx = crypto_tfm_ctx(tfm);
+
+        mctx->key = ~0;
+        return 0;
 }
 
 static struct crypto_alg alg = {
@@ -83,6 +86,7 @@ static struct crypto_alg alg = {
         .cra_ctxsize    =       sizeof(struct chksum_ctx),
         .cra_module     =       THIS_MODULE,
         .cra_list       =       LIST_HEAD_INIT(alg.cra_list),
+        .cra_init       =       crc32c_cra_init,
         .cra_u          =       {
                 .digest = {
                          .dia_digestsize=       CHKSUM_DIGEST_SIZE,