kernel: bump 4.14 to 4.14.114

[openwrt/openwrt.git] / target / linux / apm821xx / patches-4.14 / 020-0002-crypto-crypto4xx-remove-unused-definitions-and-write.patch

diff --git a/target/linux/apm821xx/patches-4.14/020-0002-crypto-crypto4xx-remove-unused-definitions-and-write.patch b/target/linux/apm821xx/patches-4.14/020-0002-crypto-crypto4xx-remove-unused-definitions-and-write.patch
index 466f0a0a78f75084c4fca5b11725f35f4fd37a28..b49bcaf88c9c2c6535d3f2c622e59e51360d17ac 100644 (file)
--- a/target/linux/apm821xx/patches-4.14/020-0002-crypto-crypto4xx-remove-unused-definitions-and-write.patch
+++ b/target/linux/apm821xx/patches-4.14/020-0002-crypto-crypto4xx-remove-unused-definitions-and-write.patch
@@ -39,9 +39,9 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
        sa = (struct dynamic_sa_ctl *) ctx->sa_in;
 -      ctx->hash_final = 0;
  
-       set_dynamic_sa_command_0(sa, SA_NOT_SAVE_HASH, SA_NOT_SAVE_IV,
-                                SA_LOAD_HASH_FROM_SA, SA_LOAD_IV_FROM_STATE,
-@@ -191,7 +188,6 @@ static int crypto4xx_hash_alg_init(struc
+       set_dynamic_sa_command_0(sa, SA_NOT_SAVE_HASH, (cm == CRYPTO_MODE_CBC ?
+                                SA_SAVE_IV : SA_NOT_SAVE_IV),
+@@ -192,7 +189,6 @@ static int crypto4xx_hash_alg_init(struc
  
        ctx->dev   = my_alg->dev;
        ctx->is_hash = 1;
@@ -49,7 +49,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  
        /* Create SA */
        if (ctx->sa_in_dma_addr || ctx->sa_out_dma_addr)
-@@ -256,7 +252,6 @@ int crypto4xx_hash_update(struct ahash_r
+@@ -257,7 +253,6 @@ int crypto4xx_hash_update(struct ahash_r
        struct crypto4xx_ctx *ctx = crypto_tfm_ctx(req->base.tfm);
  
        ctx->is_hash = 1;
@@ -57,7 +57,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
        ctx->pd_ctl = 0x11;
        ctx->direction = DIR_INBOUND;
  
-@@ -274,7 +269,6 @@ int crypto4xx_hash_digest(struct ahash_r
+@@ -275,7 +270,6 @@ int crypto4xx_hash_digest(struct ahash_r
  {
        struct crypto4xx_ctx *ctx = crypto_tfm_ctx(req->base.tfm);
  
@@ -67,7 +67,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  
 --- a/drivers/crypto/amcc/crypto4xx_core.c
 +++ b/drivers/crypto/amcc/crypto4xx_core.c
-@@ -964,7 +964,7 @@ u32 crypto4xx_build_pd(struct crypto_asy
+@@ -973,7 +973,7 @@ u32 crypto4xx_build_pd(struct crypto_asy
  
        sa->sa_command_1.bf.hash_crypto_offset = 0;
        pd->pd_ctl.w = ctx->pd_ctl;