| Message ID | 39be46fb40ad77e40ae5c1a979ca6a2ccfab244a.1560263641.git.christophe.leroy@c-s.fr (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Herbert Xu |
| Headers | show |
| Series | Additional fixes on Talitos driver | expand |
On 6/11/2019 5:39 PM, Christophe Leroy wrote: > icv_ool is not used anymore, drop it. > > Fixes: 9cc87bc3613b ("crypto: talitos - fix AEAD processing") I can't find this SHA1. Are you referring to commit e345177ded17 ("crypto: talitos - fix AEAD processing.")? Horia
Le 13/06/2019 à 14:21, Horia Geanta a écrit : > On 6/11/2019 5:39 PM, Christophe Leroy wrote: >> icv_ool is not used anymore, drop it. >> >> Fixes: 9cc87bc3613b ("crypto: talitos - fix AEAD processing") > I can't find this SHA1. > > Are you referring to commit e345177ded17 ("crypto: talitos - fix AEAD processing.")? > > Horia > Oops yes, that's the sha1 it had in my tree before it got merged. Do I have to resend it or can Herbert just drop the wrong reference and take the following one: Fixes: e345177ded17 ("crypto: talitos - fix AEAD processing.") Christophe
On Thu, Jun 13, 2019 at 02:28:51PM +0200, Christophe Leroy wrote: > > > Le 13/06/2019 à 14:21, Horia Geanta a écrit : > > On 6/11/2019 5:39 PM, Christophe Leroy wrote: > > > icv_ool is not used anymore, drop it. > > > > > > Fixes: 9cc87bc3613b ("crypto: talitos - fix AEAD processing") > > I can't find this SHA1. > > > > Are you referring to commit e345177ded17 ("crypto: talitos - fix AEAD processing.")? > > > > Horia > > > > Oops yes, that's the sha1 it had in my tree before it got merged. > > Do I have to resend it or can Herbert just drop the wrong reference and take > the following one: Please resend since you're going to change the other patches too. Thanks,
diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c index b2de931de623..03b7a5d28fb0 100644 --- a/drivers/crypto/talitos.c +++ b/drivers/crypto/talitos.c @@ -1278,9 +1278,6 @@ static int ipsec_esp(struct talitos_edesc *edesc, struct aead_request *areq, is_ipsec_esp && !encrypt); tbl_off += ret; - /* ICV data */ - edesc->icv_ool = !encrypt; - if (!encrypt && is_ipsec_esp) { struct talitos_ptr *tbl_ptr = &edesc->link_tbl[tbl_off]; diff --git a/drivers/crypto/talitos.h b/drivers/crypto/talitos.h index 95f78c6d9206..1469b956948a 100644 --- a/drivers/crypto/talitos.h +++ b/drivers/crypto/talitos.h @@ -46,7 +46,6 @@ struct talitos_desc { * talitos_edesc - s/w-extended descriptor * @src_nents: number of segments in input 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 * @dma_len: length of dma mapped link_tbl space * @dma_link_tbl: bus physical address of link_tbl/buf @@ -61,7 +60,6 @@ struct talitos_desc { struct talitos_edesc { int src_nents; int dst_nents; - bool icv_ool; dma_addr_t iv_dma; int dma_len; dma_addr_t dma_link_tbl;
icv_ool is not used anymore, drop it. Fixes: 9cc87bc3613b ("crypto: talitos - fix AEAD processing") Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> --- drivers/crypto/talitos.c | 3 --- drivers/crypto/talitos.h | 2 -- 2 files changed, 5 deletions(-)