diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-27 17:51:36 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-27 17:51:36 -0800 |
| commit | 2d706e790f0508dff4fb72eca9b4892b79757feb (patch) | |
| tree | 1c79c1ec8880f5d6184d166d1f423956833724aa /drivers/crypto/marvell/cesa.h | |
| parent | 8f18e4d03ed8fa5e4a300c94550533bd8ce4ff9a (diff) | |
| parent | 8759fec4af222f338d08f8f1a7ad6a77ca6cb301 (diff) | |
| download | op-kernel-dev-2d706e790f0508dff4fb72eca9b4892b79757feb.zip op-kernel-dev-2d706e790f0508dff4fb72eca9b4892b79757feb.tar.gz | |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fix from Herbert Xu:
"This fixes a hash corruption bug in the marvell driver"
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: marvell - Copy IVDIG before launching partial DMA ahash requests
Diffstat (limited to 'drivers/crypto/marvell/cesa.h')
| -rw-r--r-- | drivers/crypto/marvell/cesa.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/crypto/marvell/cesa.h b/drivers/crypto/marvell/cesa.h index a768da7..b7872f6 100644 --- a/drivers/crypto/marvell/cesa.h +++ b/drivers/crypto/marvell/cesa.h @@ -273,7 +273,8 @@ struct mv_cesa_op_ctx { #define CESA_TDMA_SRC_IN_SRAM BIT(30) #define CESA_TDMA_END_OF_REQ BIT(29) #define CESA_TDMA_BREAK_CHAIN BIT(28) -#define CESA_TDMA_TYPE_MSK GENMASK(27, 0) +#define CESA_TDMA_SET_STATE BIT(27) +#define CESA_TDMA_TYPE_MSK GENMASK(26, 0) #define CESA_TDMA_DUMMY 0 #define CESA_TDMA_DATA 1 #define CESA_TDMA_OP 2 |
