diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-04-29 12:13:16 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-05-02 13:00:26 +0200 |
| commit | 4685bf1d2f509f0bf1384b4a39768bbde7e3d0f8 (patch) | |
| tree | e435fcb09a88b8e22ffccf0f66c9288e0675cf89 /target/linux/apm821xx/patches-4.14/020-0002-crypto-crypto4xx-remove-unused-definitions-and-write.patch | |
| parent | 2faceb1a395fcd61107b2154638b35d15172ef06 (diff) | |
| download | upstream-4685bf1d2f509f0bf1384b4a39768bbde7e3d0f8.tar.gz upstream-4685bf1d2f509f0bf1384b4a39768bbde7e3d0f8.tar.bz2 upstream-4685bf1d2f509f0bf1384b4a39768bbde7e3d0f8.zip | |
kernel: bump 4.14 to 4.14.114
Refreshed all patches.
Altered patches:
- 150-bridge_allow_receiption_on_disabled_port.patch
- 201-extra_optimization.patch
Remove upstreamed:
- 022-0006-crypto-crypto4xx-properly-set-IV-after-de-and-encryp.patch
Compile-tested on: cns3xxx, imx6
Runtime-tested on: cns3xxx, imx6
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/apm821xx/patches-4.14/020-0002-crypto-crypto4xx-remove-unused-definitions-and-write.patch')
| -rw-r--r-- | target/linux/apm821xx/patches-4.14/020-0002-crypto-crypto4xx-remove-unused-definitions-and-write.patch | 12 |
1 files changed, 6 insertions, 6 deletions
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 466f0a0a78..b49bcaf88c 100644 --- 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; |