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

Commit d45b1714 authored Jun 24, 2019 by Christophe Leroy Committed by Herbert Xu Jul 03, 2019

crypto: talitos - drop icv_ool



icv_ool is not used anymore, drop it.

Fixes: e345177d ("crypto: talitos - fix AEAD processing.")
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

parent 58cdbc6d

drivers/crypto/talitos.c

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1285,9 +1285,6 @@ static int ipsec_esp(struct talitos_edesc edesc, struct aead_request areq,
	is_ipsec_esp && !encrypt);		is_ipsec_esp && !encrypt);
	tbl_off += ret;		tbl_off += ret;

	/* ICV data */
	edesc->icv_ool = !encrypt;

	if (!encrypt && is_ipsec_esp) {		if (!encrypt && is_ipsec_esp) {
	struct talitos_ptr *tbl_ptr = &edesc->link_tbl[tbl_off];		struct talitos_ptr *tbl_ptr = &edesc->link_tbl[tbl_off];

drivers/crypto/talitos.h

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -46,7 +46,6 @@ struct talitos_desc {
	* talitos_edesc - s/w-extended descriptor		* talitos_edesc - s/w-extended descriptor
	* @src_nents: number of segments in input scatterlist		* @src_nents: number of segments in input scatterlist
	* @dst_nents: number of segments in output scatterlist		* @dst_nents: number of segments in output scatterlist
	* @icv_ool: whether ICV is out-of-line
	* @iv_dma: dma address of iv for checking continuity and link table		* @iv_dma: dma address of iv for checking continuity and link table
	* @dma_len: length of dma mapped link_tbl space		* @dma_len: length of dma mapped link_tbl space
	* @dma_link_tbl: bus physical address of link_tbl/buf		* @dma_link_tbl: bus physical address of link_tbl/buf
	@@ -61,7 +60,6 @@ struct talitos_desc {
	struct talitos_edesc {		struct talitos_edesc {
	int src_nents;		int src_nents;
	int dst_nents;		int dst_nents;
	bool icv_ool;
	dma_addr_t iv_dma;		dma_addr_t iv_dma;
	int dma_len;		int dma_len;
	dma_addr_t dma_link_tbl;		dma_addr_t dma_link_tbl;