summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2015-08-07 18:15:13 +0200
committerJens Axboe <axboe@fb.com>2015-08-17 08:12:54 -0600
commitc56f6d1270b9fc31144b59106bc8590c2acf4a8e (patch)
treeaed4bd399c4b10300da7283e935688d7374e1c3d /crypto
parent02c4de53add1b799f5663d5e9c8e9a5d9366a507 (diff)
downloadlinux-c56f6d1270b9fc31144b59106bc8590c2acf4a8e.tar.gz
linux-c56f6d1270b9fc31144b59106bc8590c2acf4a8e.tar.bz2
linux-c56f6d1270b9fc31144b59106bc8590c2acf4a8e.zip
crypto: replace scatterwalk_sg_chain with sg_chain
Signed-off-by: Dan Williams <dan.j.williams@intel.com> [hch: split from a larger patch by Dan] Signed-off-by: Christoph Hellwig <hch@lst.de> Acked-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/algif_skcipher.c2
-rw-r--r--crypto/ccm.c8
-rw-r--r--crypto/gcm.c4
3 files changed, 7 insertions, 7 deletions
diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c
index 945075292bc9..af31a0ee4057 100644
--- a/crypto/algif_skcipher.c
+++ b/crypto/algif_skcipher.c
@@ -145,7 +145,7 @@ static int skcipher_alloc_sgl(struct sock *sk)
sgl->cur = 0;
if (sg)
- scatterwalk_sg_chain(sg, MAX_SGL_ENTS + 1, sgl->sg);
+ sg_chain(sg, MAX_SGL_ENTS + 1, sgl->sg);
list_add_tail(&sgl->list, &ctx->tsgl);
}
diff --git a/crypto/ccm.c b/crypto/ccm.c
index a4d1a5eda18b..b3f52f50d1c1 100644
--- a/crypto/ccm.c
+++ b/crypto/ccm.c
@@ -329,13 +329,13 @@ static int crypto_ccm_encrypt(struct aead_request *req)
sg_init_table(pctx->src, 2);
sg_set_buf(pctx->src, odata, 16);
- scatterwalk_sg_chain(pctx->src, 2, req->src);
+ sg_chain(pctx->src, 2, req->src);
dst = pctx->src;
if (req->src != req->dst) {
sg_init_table(pctx->dst, 2);
sg_set_buf(pctx->dst, odata, 16);
- scatterwalk_sg_chain(pctx->dst, 2, req->dst);
+ sg_chain(pctx->dst, 2, req->dst);
dst = pctx->dst;
}
@@ -400,13 +400,13 @@ static int crypto_ccm_decrypt(struct aead_request *req)
sg_init_table(pctx->src, 2);
sg_set_buf(pctx->src, authtag, 16);
- scatterwalk_sg_chain(pctx->src, 2, req->src);
+ sg_chain(pctx->src, 2, req->src);
dst = pctx->src;
if (req->src != req->dst) {
sg_init_table(pctx->dst, 2);
sg_set_buf(pctx->dst, authtag, 16);
- scatterwalk_sg_chain(pctx->dst, 2, req->dst);
+ sg_chain(pctx->dst, 2, req->dst);
dst = pctx->dst;
}
diff --git a/crypto/gcm.c b/crypto/gcm.c
index 7d32d4720564..ab0b2f9e8fad 100644
--- a/crypto/gcm.c
+++ b/crypto/gcm.c
@@ -200,14 +200,14 @@ static void crypto_gcm_init_common(struct aead_request *req)
sg_set_buf(pctx->src, pctx->auth_tag, sizeof(pctx->auth_tag));
sg = scatterwalk_ffwd(pctx->src + 1, req->src, req->assoclen);
if (sg != pctx->src + 1)
- scatterwalk_sg_chain(pctx->src, 2, sg);
+ sg_chain(pctx->src, 2, sg);
if (req->src != req->dst) {
sg_init_table(pctx->dst, 3);
sg_set_buf(pctx->dst, pctx->auth_tag, sizeof(pctx->auth_tag));
sg = scatterwalk_ffwd(pctx->dst + 1, req->dst, req->assoclen);
if (sg != pctx->dst + 1)
- scatterwalk_sg_chain(pctx->dst, 2, sg);
+ sg_chain(pctx->dst, 2, sg);
}
}