kernel: bump 4.14 to 4.14.114

[openwrt/openwrt.git] / target / linux / apm821xx / patches-4.14 / 022-0002-crypto-crypto4xx-performance-optimizations.patch

diff --git a/target/linux/apm821xx/patches-4.14/022-0002-crypto-crypto4xx-performance-optimizations.patch b/target/linux/apm821xx/patches-4.14/022-0002-crypto-crypto4xx-performance-optimizations.patch
index f1035be52fc3c4e09d42af59fde920d9ba65bdc6..74d5ab2f60b35d3b5575d52be0f33bc0593b0dbb 100644 (file)
--- a/target/linux/apm821xx/patches-4.14/022-0002-crypto-crypto4xx-performance-optimizations.patch
+++ b/target/linux/apm821xx/patches-4.14/022-0002-crypto-crypto4xx-performance-optimizations.patch
@@ -71,7 +71,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
-@@ -580,7 +580,7 @@ static void crypto4xx_aead_done(struct c
+@@ -589,7 +589,7 @@ static void crypto4xx_aead_done(struct c
        struct scatterlist *dst = pd_uinfo->dest_va;
        size_t cp_len = crypto_aead_authsize(
                crypto_aead_reqtfm(aead_req));
@@ -80,7 +80,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
        int err = 0;
  
        if (pd_uinfo->using_sd) {
-@@ -595,7 +595,7 @@ static void crypto4xx_aead_done(struct c
+@@ -604,7 +604,7 @@ static void crypto4xx_aead_done(struct c
        if (pd_uinfo->sa_va->sa_command_0.bf.dir == DIR_OUTBOUND) {
                /* append icv at the end */
                crypto4xx_memcpy_from_le32(icv, pd_uinfo->sr_va->save_digest,
@@ -89,7 +89,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  
                scatterwalk_map_and_copy(icv, dst, aead_req->cryptlen,
                                         cp_len, 1);
-@@ -605,7 +605,7 @@ static void crypto4xx_aead_done(struct c
+@@ -614,7 +614,7 @@ static void crypto4xx_aead_done(struct c
                        aead_req->assoclen + aead_req->cryptlen -
                        cp_len, cp_len, 0);
  
@@ -98,7 +98,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  
                if (crypto_memneq(icv, pd_uinfo->sr_va->save_digest, cp_len))
                        err = -EBADMSG;
-@@ -1122,8 +1122,8 @@ static struct crypto4xx_alg_common crypt
+@@ -1131,8 +1131,8 @@ static struct crypto4xx_alg_common crypt
                                .max_keysize    = AES_MAX_KEY_SIZE,
                                .ivsize         = AES_IV_SIZE,
                                .setkey         = crypto4xx_setkey_aes_cbc,
@@ -109,7 +109,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
                        }
                }
        }},
-@@ -1146,8 +1146,8 @@ static struct crypto4xx_alg_common crypt
+@@ -1155,8 +1155,8 @@ static struct crypto4xx_alg_common crypt
                                .max_keysize    = AES_MAX_KEY_SIZE,
                                .ivsize         = AES_IV_SIZE,
                                .setkey         = crypto4xx_setkey_aes_cfb,
@@ -120,7 +120,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
                        }
                }
        } },
-@@ -1195,8 +1195,8 @@ static struct crypto4xx_alg_common crypt
+@@ -1204,8 +1204,8 @@ static struct crypto4xx_alg_common crypt
                                .min_keysize    = AES_MIN_KEY_SIZE,
                                .max_keysize    = AES_MAX_KEY_SIZE,
                                .setkey         = crypto4xx_setkey_aes_ecb,
@@ -131,7 +131,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
                        }
                }
        } },
-@@ -1219,8 +1219,8 @@ static struct crypto4xx_alg_common crypt
+@@ -1228,8 +1228,8 @@ static struct crypto4xx_alg_common crypt
                                .max_keysize    = AES_MAX_KEY_SIZE,
                                .ivsize         = AES_IV_SIZE,
                                .setkey         = crypto4xx_setkey_aes_ofb,