remove queue-3.10/crypto-caam-fix-addressing-of-struct-member.patch

diff --git a/queue-3.10/crypto-caam-fix-addressing-of-struct-member.patch b/queue-3.10/crypto-caam-fix-addressing-of-struct-member.patch
deleted file mode 100644 (file)
index 17a15b0..0000000
--- a/queue-3.10/crypto-caam-fix-addressing-of-struct-member.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 4451d494b1910bf7b7f8381a637d0fe6d2142467 Mon Sep 17 00:00:00 2001
-From: Cristian Stoica <cristian.stoica@freescale.com>
-Date: Thu, 14 Aug 2014 13:51:57 +0300
-Subject: crypto: caam - fix addressing of struct member
-
-From: Cristian Stoica <cristian.stoica@freescale.com>
-
-commit 4451d494b1910bf7b7f8381a637d0fe6d2142467 upstream.
-
-buf_0 and buf_1 in caam_hash_state are not next to each other.
-Accessing buf_1 is incorrect from &buf_0 with an offset of only
-size_of(buf_0). The same issue is also with buflen_0 and buflen_1
-
-Signed-off-by: Cristian Stoica <cristian.stoica@freescale.com>
-Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/crypto/caam/caamhash.c |    6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/drivers/crypto/caam/caamhash.c
-+++ b/drivers/crypto/caam/caamhash.c
-@@ -1345,9 +1345,9 @@ static int ahash_update_first(struct aha
-       struct device *jrdev = ctx->jrdev;
-       gfp_t flags = (req->base.flags & (CRYPTO_TFM_REQ_MAY_BACKLOG |
-                      CRYPTO_TFM_REQ_MAY_SLEEP)) ? GFP_KERNEL : GFP_ATOMIC;
--      u8 *next_buf = state->buf_0 + state->current_buf *
--                     CAAM_MAX_HASH_BLOCK_SIZE;
--      int *next_buflen = &state->buflen_0 + state->current_buf;
-+      u8 *next_buf = state->current_buf ? state->buf_1 : state->buf_0;
-+      int *next_buflen = state->current_buf ?
-+              &state->buflen_1 : &state->buflen_0;
-       int to_hash;
-       u32 *sh_desc = ctx->sh_desc_update_first, *desc;
-       dma_addr_t ptr = ctx->sh_desc_update_first_dma;

diff --git a/queue-3.10/series b/queue-3.10/series
index c2c6a66a50ac2e32c0e1ed0c91063acf49c90278..ebd86f362743a4f111a9b6a9bbf1748f8e8a7654 100644 (file)
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -1,7 +1,6 @@
 usb-serial-cp210x-added-ketra-n1-wireless-interface-support.patch
 usb-cp210x-add-support-for-seluxit-usb-dongle.patch
 usb-add-device-quirk-for-asus-t100-base-station-keyboard.patch
-crypto-caam-fix-addressing-of-struct-member.patch
 udf-avoid-infinite-loop-when-processing-indirect-icbs.patch
 perf-fix-perf-bug-in-fork.patch
 init-kconfig-fix-have_futex_cmpxchg-to-not-break-up-the-expert-menu.patch