diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-02 12:40:24 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-02 12:40:24 -0400 |
| commit | 8f6b7676ceecc1f40df77d5a4d6a8bae87594a2d (patch) | |
| tree | aaac7c2858dab9817af579f2ad39f2f18ce4dbd8 /include/linux | |
| parent | 143418d0c87fda0c587205c45094d8b05222fd49 (diff) | |
| parent | 5219a5342ab13650ae0f0c62319407268c48d0ab (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
- Fix for CPU hotplug hang in padata.
- Avoid using cpu_active inappropriately in pcrypt and padata.
- Fix for user-space algorithm lookup hang with IV generators.
- Fix for netlink dump of algorithms where stuff went missing due to
incorrect calculation of message size.
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: user - Fix size of netlink dump message
crypto: user - Fix lookup of algorithms with IV generator
crypto: pcrypt - Use the online cpumask as the default
padata: Fix cpu hotplug
padata: Use the online cpumask as the default
padata: Add a reference to the api documentation
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/cryptouser.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/cryptouser.h b/include/linux/cryptouser.h index 532fb58f16bf..4abf2ea6a887 100644 --- a/include/linux/cryptouser.h +++ b/include/linux/cryptouser.h | |||
| @@ -100,3 +100,6 @@ struct crypto_report_rng { | |||
| 100 | char type[CRYPTO_MAX_NAME]; | 100 | char type[CRYPTO_MAX_NAME]; |
| 101 | unsigned int seedsize; | 101 | unsigned int seedsize; |
| 102 | }; | 102 | }; |
| 103 | |||
| 104 | #define CRYPTO_REPORT_MAXSIZE (sizeof(struct crypto_user_alg) + \ | ||
| 105 | sizeof(struct crypto_report_blkcipher)) | ||