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: ar71xx, cns3xxx, imx6, x86_64
Runtime-tested on: ar71xx, cns3xxx, imx6

Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>

1 files changed, 9 insertions, 9 deletions

diff --git a/target/linux/apm821xx/patches-4.14/022-0003-crypto-crypto4xx-convert-to-skcipher.patch b/target/linux/apm821xx/patches-4.14/022-0003-crypto-crypto4xx-convert-to-skcipher.patch
index 291c4ef465..64c07d7127 100644
--- a/target/linux/apm821xx/patches-4.14/022-0003-crypto-crypto4xx-convert-to-skcipher.patch
+++ b/target/linux/apm821xx/patches-4.14/022-0003-crypto-crypto4xx-convert-to-skcipher.patch
@@ -96,7 +96,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  				CRYPTO_TFM_RES_BAD_KEY_LEN);
  		return -EINVAL;
  	}
-@@ -164,39 +165,38 @@ static int crypto4xx_setkey_aes(struct c
+@@ -165,39 +166,38 @@ static int crypto4xx_setkey_aes(struct c
  	return 0;
  }
  
@@ -142,7 +142,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  	int rc;
  
  	rc = crypto4xx_setkey_aes(cipher, key, keylen - CTR_RFC3686_NONCE_SIZE,
-@@ -210,31 +210,33 @@ int crypto4xx_setkey_rfc3686(struct cryp
+@@ -211,31 +211,33 @@ int crypto4xx_setkey_rfc3686(struct cryp
  	return 0;
  }
  
@@ -223,7 +223,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  	} else {
  		dst = pd_uinfo->dest_va;
  		addr = dma_map_page(dev->core_dev->device, sg_page(dst),
-@@ -549,8 +548,8 @@ static void crypto4xx_ablkcipher_done(st
+@@ -558,8 +557,8 @@ static void crypto4xx_ablkcipher_done(st
  	crypto4xx_ret_sg_desc(dev, pd_uinfo);
  
  	if (pd_uinfo->state & PD_ENTRY_BUSY)
@@ -234,7 +234,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  }
  
  static void crypto4xx_ahash_done(struct crypto4xx_device *dev,
-@@ -641,8 +640,8 @@ static void crypto4xx_pd_done(struct cry
+@@ -650,8 +649,8 @@ static void crypto4xx_pd_done(struct cry
  	struct pd_uinfo *pd_uinfo = &dev->pdr_uinfo[idx];
  
  	switch (crypto_tfm_alg_type(pd_uinfo->async_req->tfm)) {
@@ -245,7 +245,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  		break;
  	case CRYPTO_ALG_TYPE_AEAD:
  		crypto4xx_aead_done(dev, pd_uinfo, pd);
-@@ -936,15 +935,14 @@ static void crypto4xx_ctx_init(struct cr
+@@ -945,15 +944,14 @@ static void crypto4xx_ctx_init(struct cr
  	ctx->sa_len = 0;
  }
  
@@ -264,7 +264,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  	return 0;
  }
  
-@@ -953,9 +951,11 @@ static void crypto4xx_common_exit(struct
+@@ -962,9 +960,11 @@ static void crypto4xx_common_exit(struct
  	crypto4xx_free_sa(ctx);
  }
  
@@ -278,7 +278,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  }
  
  static int crypto4xx_aead_init(struct crypto_aead *tfm)
-@@ -1012,7 +1012,7 @@ static int crypto4xx_register_alg(struct
+@@ -1021,7 +1021,7 @@ static int crypto4xx_register_alg(struct
  			break;
  
  		default:
@@ -287,7 +287,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  			break;
  		}
  
-@@ -1041,7 +1041,7 @@ static void crypto4xx_unregister_alg(str
+@@ -1050,7 +1050,7 @@ static void crypto4xx_unregister_alg(str
  			break;
  
  		default:
@@ -296,7 +296,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  		}
  		kfree(alg);
  	}
-@@ -1103,126 +1103,109 @@ static irqreturn_t crypto4xx_ce_interrup
+@@ -1112,126 +1112,109 @@ static irqreturn_t crypto4xx_ce_interrup
   */
  static struct crypto4xx_alg_common crypto4xx_alg[] = {
  	/* Crypto AES modes */