mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 23:12:32 +00:00
f80272dd9c
Refreshed all patches. Remove upstreamed: - 302-0002-dmaengine-dw-implement-per-channel-protection-contro.patch Fixes: - CVE-2019-19332 Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
63 lines
2.0 KiB
Diff
63 lines
2.0 KiB
Diff
From 64e1062b2371cb8d6126d4e970832365a1a84562 Mon Sep 17 00:00:00 2001
|
|
From: Christian Lamparter <chunkeey@gmail.com>
|
|
Date: Wed, 4 Oct 2017 01:00:12 +0200
|
|
Subject: [PATCH 20/25] crypto: crypto4xx - fix various warnings
|
|
|
|
crypto4xx_core.c:179:6: warning: symbol 'crypto4xx_free_state_record'
|
|
was not declared. Should it be static?
|
|
crypto4xx_core.c:331:5: warning: symbol 'crypto4xx_get_n_gd'
|
|
was not declared. Should it be static?
|
|
crypto4xx_core.c:652:6: warning: symbol 'crypto4xx_return_pd'
|
|
was not declared. Should it be static?
|
|
|
|
crypto4xx_return_pd() is not used by anything. Therefore it is removed.
|
|
|
|
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
|
|
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
|
|
---
|
|
drivers/crypto/amcc/crypto4xx_core.c | 16 +++-------------
|
|
1 file changed, 3 insertions(+), 13 deletions(-)
|
|
|
|
--- a/drivers/crypto/amcc/crypto4xx_core.c
|
|
+++ b/drivers/crypto/amcc/crypto4xx_core.c
|
|
@@ -176,7 +176,7 @@ u32 crypto4xx_alloc_state_record(struct
|
|
return 0;
|
|
}
|
|
|
|
-void crypto4xx_free_state_record(struct crypto4xx_ctx *ctx)
|
|
+static void crypto4xx_free_state_record(struct crypto4xx_ctx *ctx)
|
|
{
|
|
if (ctx->state_record != NULL)
|
|
dma_free_coherent(ctx->dev->core_dev->device,
|
|
@@ -322,10 +322,11 @@ static inline void crypto4xx_destroy_gdr
|
|
* when this function is called.
|
|
* preemption or interrupt must be disabled
|
|
*/
|
|
-u32 crypto4xx_get_n_gd(struct crypto4xx_device *dev, int n)
|
|
+static u32 crypto4xx_get_n_gd(struct crypto4xx_device *dev, int n)
|
|
{
|
|
u32 retval;
|
|
u32 tmp;
|
|
+
|
|
if (n >= PPC4XX_NUM_GD)
|
|
return ERING_WAS_FULL;
|
|
|
|
@@ -621,17 +622,6 @@ static void crypto4xx_stop_all(struct cr
|
|
kfree(core_dev);
|
|
}
|
|
|
|
-void crypto4xx_return_pd(struct crypto4xx_device *dev,
|
|
- u32 pd_entry, struct ce_pd *pd,
|
|
- struct pd_uinfo *pd_uinfo)
|
|
-{
|
|
- /* irq should be already disabled */
|
|
- dev->pdr_head = pd_entry;
|
|
- pd->pd_ctl.w = 0;
|
|
- pd->pd_ctl_len.w = 0;
|
|
- pd_uinfo->state = PD_ENTRY_FREE;
|
|
-}
|
|
-
|
|
static u32 get_next_gd(u32 current)
|
|
{
|
|
if (current != PPC4XX_LAST_GD)
|