forked from luck/tmp_suning_uos_patched
crypto: hifn_795x - Rename ablkcipher_walk to hifn_cipher_walk
This is in preparation for the generic ablkcipher_walk helpers that will be added to the crypto layer. Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
parent
3789ae7dcd
commit
3385329a0a
|
@ -638,7 +638,7 @@ struct hifn_crypto_alg
|
||||||
|
|
||||||
#define ASYNC_FLAGS_MISALIGNED (1<<0)
|
#define ASYNC_FLAGS_MISALIGNED (1<<0)
|
||||||
|
|
||||||
struct ablkcipher_walk
|
struct hifn_cipher_walk
|
||||||
{
|
{
|
||||||
struct scatterlist cache[ASYNC_SCATTERLIST_CACHE];
|
struct scatterlist cache[ASYNC_SCATTERLIST_CACHE];
|
||||||
u32 flags;
|
u32 flags;
|
||||||
|
@ -657,7 +657,7 @@ struct hifn_request_context
|
||||||
u8 *iv;
|
u8 *iv;
|
||||||
unsigned int ivsize;
|
unsigned int ivsize;
|
||||||
u8 op, type, mode, unused;
|
u8 op, type, mode, unused;
|
||||||
struct ablkcipher_walk walk;
|
struct hifn_cipher_walk walk;
|
||||||
};
|
};
|
||||||
|
|
||||||
#define crypto_alg_to_hifn(a) container_of(a, struct hifn_crypto_alg, alg)
|
#define crypto_alg_to_hifn(a) container_of(a, struct hifn_crypto_alg, alg)
|
||||||
|
@ -1417,7 +1417,7 @@ static int hifn_setup_dma(struct hifn_device *dev,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int ablkcipher_walk_init(struct ablkcipher_walk *w,
|
static int hifn_cipher_walk_init(struct hifn_cipher_walk *w,
|
||||||
int num, gfp_t gfp_flags)
|
int num, gfp_t gfp_flags)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
@ -1442,7 +1442,7 @@ static int ablkcipher_walk_init(struct ablkcipher_walk *w,
|
||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void ablkcipher_walk_exit(struct ablkcipher_walk *w)
|
static void hifn_cipher_walk_exit(struct hifn_cipher_walk *w)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
@ -1486,8 +1486,8 @@ static int ablkcipher_add(unsigned int *drestp, struct scatterlist *dst,
|
||||||
return idx;
|
return idx;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int ablkcipher_walk(struct ablkcipher_request *req,
|
static int hifn_cipher_walk(struct ablkcipher_request *req,
|
||||||
struct ablkcipher_walk *w)
|
struct hifn_cipher_walk *w)
|
||||||
{
|
{
|
||||||
struct scatterlist *dst, *t;
|
struct scatterlist *dst, *t;
|
||||||
unsigned int nbytes = req->nbytes, offset, copy, diff;
|
unsigned int nbytes = req->nbytes, offset, copy, diff;
|
||||||
|
@ -1600,12 +1600,12 @@ static int hifn_setup_session(struct ablkcipher_request *req)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (rctx->walk.flags & ASYNC_FLAGS_MISALIGNED) {
|
if (rctx->walk.flags & ASYNC_FLAGS_MISALIGNED) {
|
||||||
err = ablkcipher_walk_init(&rctx->walk, idx, GFP_ATOMIC);
|
err = hifn_cipher_walk_init(&rctx->walk, idx, GFP_ATOMIC);
|
||||||
if (err < 0)
|
if (err < 0)
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
sg_num = ablkcipher_walk(req, &rctx->walk);
|
sg_num = hifn_cipher_walk(req, &rctx->walk);
|
||||||
if (sg_num < 0) {
|
if (sg_num < 0) {
|
||||||
err = sg_num;
|
err = sg_num;
|
||||||
goto err_out_exit;
|
goto err_out_exit;
|
||||||
|
@ -1806,7 +1806,7 @@ static void hifn_process_ready(struct ablkcipher_request *req, int error)
|
||||||
kunmap_atomic(saddr, KM_SOFTIRQ0);
|
kunmap_atomic(saddr, KM_SOFTIRQ0);
|
||||||
}
|
}
|
||||||
|
|
||||||
ablkcipher_walk_exit(&rctx->walk);
|
hifn_cipher_walk_exit(&rctx->walk);
|
||||||
}
|
}
|
||||||
|
|
||||||
req->base.complete(&req->base, error);
|
req->base.complete(&req->base, error);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user