Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e29bc6ad0e84e3157e0f49130a15b278cb232c72
Commit: e29bc6ad0e84e3157e0f49130a15b278cb232c72
Parent: 9aa6ad3e87af58b4fc87bd4beef1d4c6d9a4c5b7
Author: Herbert Xu <[EMAIL PROTECTED]>
AuthorDate: Thu Nov 22 22:46:40 2007 +0800
Committer: Herbert Xu <[EMAIL PROTECTED]>
CommitDate: Fri Jan 11 08:16:28 2008 +1100
[CRYPTO] authenc: Use or instead of max on alignment masks
Since alignment masks are always one less than a power of two, we can
use binary or to find their maximum.
Signed-off-by: Herbert Xu <[EMAIL PROTECTED]>
---
crypto/authenc.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/crypto/authenc.c b/crypto/authenc.c
index bc4e608..66fb2aa 100644
--- a/crypto/authenc.c
+++ b/crypto/authenc.c
@@ -333,7 +333,7 @@ static struct crypto_instance *crypto_authenc_alloc(struct
rtattr **tb)
inst->alg.cra_flags = CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_ASYNC;
inst->alg.cra_priority = enc->cra_priority * 10 + auth->cra_priority;
inst->alg.cra_blocksize = enc->cra_blocksize;
- inst->alg.cra_alignmask = max(auth->cra_alignmask, enc->cra_alignmask);
+ inst->alg.cra_alignmask = auth->cra_alignmask | enc->cra_alignmask;
inst->alg.cra_type = &crypto_aead_type;
inst->alg.cra_aead.ivsize = enc->cra_blkcipher.ivsize;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
