From 16d15395cf44fb17c970bf6bd751af32487123da Mon Sep 17 00:00:00 2001
From: Kim Phillips <kim.phillips@freescale.com>
Date: Sun, 29 Mar 2009 15:54:30 +0800
Subject: [PATCH] --- yaml --- r: 148799 b: refs/heads/master c:
 962a9c99496f98041d14d64a9fdcf58050fefb4d h: refs/heads/master i:   148797:
 adfe61261a0147ab7212d313d827b5078ff4cf16   148795:
 8ae4e4a21ae5d104b53d4ec76bb096fa83c78f75   148791:
 1a415768c87f7a8987f8d317de28d4298a6b0669   148783:
 456586a984ff4a79988c01f9a60461c9d0d1eb57   148767:
 7fafd312aa0aa7ba1f1644e574d3a21dd4622b7b   148735:
 64fbab60082b56aa0b3ee462c1a2346319e9aa50 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/crypto/talitos.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

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,