Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6

[karo-tx-linux.git] / crypto / cmac.c

diff --git a/crypto/cmac.c b/crypto/cmac.c
index 04080dca8f0c9ee56736cbd0233d57cc59d4562e..16301f52858ca64995dc194b1e12791ed0d139a7 100644 (file)
--- a/crypto/cmac.c
+++ b/crypto/cmac.c
@@ -260,8 +260,7 @@ static int cmac_create(struct crypto_template *tmpl, struct rtattr **tb)
        if (err)
                goto out_free_inst;
 
-       /* We access the data as u32s when xoring. */
-       alignmask = alg->cra_alignmask | (__alignof__(u32) - 1);
+       alignmask = alg->cra_alignmask;
        inst->alg.base.cra_alignmask = alignmask;
        inst->alg.base.cra_priority = alg->cra_priority;
        inst->alg.base.cra_blocksize = alg->cra_blocksize;