diff --git a/[refs] b/[refs] index e1d9138996f6..c1e0094a5688 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 19bbbc635523703ece28409e59694d5b512b819e +refs/heads/master: 962a9c99496f98041d14d64a9fdcf58050fefb4d diff --git a/trunk/drivers/crypto/talitos.c b/trunk/drivers/crypto/talitos.c index 1cc1c411e551..c70775fd3ce2 100644 --- a/trunk/drivers/crypto/talitos.c +++ b/trunk/drivers/crypto/talitos.c @@ -1010,8 +1010,7 @@ static int ipsec_esp(struct talitos_edesc *edesc, struct aead_request *areq, } else { sg_link_tbl_len = cryptlen; - if ((edesc->desc.hdr & DESC_HDR_MODE1_MDEU_CICV) && - (edesc->desc.hdr & DESC_HDR_MODE0_ENCRYPT) == 0) + if (edesc->desc.hdr & DESC_HDR_MODE1_MDEU_CICV) sg_link_tbl_len = cryptlen + authsize; sg_count = sg_to_link_tbl(areq->src, sg_count, sg_link_tbl_len,