Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c56f6d12 authored by Dan Williams's avatar Dan Williams Committed by Jens Axboe
Browse files

crypto: replace scatterwalk_sg_chain with sg_chain 



Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
[hch: split from a larger patch by Dan]
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 02c4de53

crypto/algif_skcipher.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

	}

crypto/ccm.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

	}

crypto/gcm.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

	}

}

drivers/crypto/bfin_crc.c

+1 −2
Original line number Diff line number Diff line
@@ -370,8 +370,7 @@ static int bfin_crypto_crc_handle_queue(struct bfin_crypto_crc *crc, 
			sg_init_table(ctx->bufsl, nsg);

			sg_set_buf(ctx->bufsl, ctx->buflast, ctx->buflast_len);

			if (nsg > 1)

				scatterwalk_sg_chain(ctx->bufsl, nsg,

						req->src);

				sg_chain(ctx->bufsl, nsg, req->src);

			ctx->sg = ctx->bufsl;

		} else

			ctx->sg = req->src;

drivers/crypto/qce/sha.c

+1 −1
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ static int qce_ahash_update(struct ahash_request *req) 
	if (rctx->buflen) {

		sg_init_table(rctx->sg, 2);

		sg_set_buf(rctx->sg, rctx->tmpbuf, rctx->buflen);

		scatterwalk_sg_chain(rctx->sg, 2, req->src);

		sg_chain(rctx->sg, 2, req->src);

		req->src = rctx->sg;

	}