diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-22 19:33:00 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-22 19:33:00 -0400 |
| commit | 38afd6adf6bccd7176e88c07cac104d3639aa30d (patch) | |
| tree | 2142409984b609e51ef60b6a14318dd4e878718a /crypto/internal.h | |
| parent | 8ed1383fb7b6685968588141d5934e0e6715e954 (diff) | |
| parent | 261688d01ec07d3a265b8ace6ec68310fbd96a96 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'crypto/internal.h')
| -rw-r--r-- | crypto/internal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/internal.h b/crypto/internal.h index 68612874b5fd..37515beafc8c 100644 --- a/crypto/internal.h +++ b/crypto/internal.h | |||
| @@ -75,7 +75,7 @@ static inline unsigned int crypto_cipher_ctxsize(struct crypto_alg *alg, | |||
| 75 | 75 | ||
| 76 | switch (flags & CRYPTO_TFM_MODE_MASK) { | 76 | switch (flags & CRYPTO_TFM_MODE_MASK) { |
| 77 | case CRYPTO_TFM_MODE_CBC: | 77 | case CRYPTO_TFM_MODE_CBC: |
| 78 | len = ALIGN(len, alg->cra_alignmask + 1); | 78 | len = ALIGN(len, (unsigned long)alg->cra_alignmask + 1); |
| 79 | len += alg->cra_blocksize; | 79 | len += alg->cra_blocksize; |
| 80 | break; | 80 | break; |
| 81 | } | 81 | } |