From 8846da7fac80613c59df9b0f18899c2315f879f4 Mon Sep 17 00:00:00 2001
From: Kim Phillips <kim.phillips@freescale.com>
Date: Sun, 14 Sep 2008 13:41:19 -0700
Subject: [PATCH] --- yaml --- r: 109839 b: refs/heads/master c:
 ba95487df97f9c45cfdae2a47de56235e7a13dc5 h: refs/heads/master i:   109837:
 a20fd686656f227cb4a4bf52eb427bd77f42392d   109835:
 b0740a28cd71503601eed2a7190e89c2ffc26dd4   109831:
 17baacea460dfbcf887959f3479ffba5987b127d   109823:
 06cad187dcc56192df87a1e81fc5da7a15c01c6e v: v3

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

diff --git a/[refs] b/[refs]
index 8d4021073268..355a7c910d2a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 212387055902b65f79463d1934033255aa6b99e1
+refs/heads/master: ba95487df97f9c45cfdae2a47de56235e7a13dc5
diff --git a/trunk/.mailmap b/trunk/.mailmap
index dfab12f809ed..726084286d33 100644
--- a/trunk/.mailmap
+++ b/trunk/.mailmap
@@ -96,6 +96,4 @@ Tejun Heo <htejun@gmail.com>
 Thomas Graf <tgraf@suug.ch>
 Tony Luck <tony.luck@intel.com>
 Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>
-Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
-Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
 Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
diff --git a/trunk/drivers/crypto/talitos.c b/trunk/drivers/crypto/talitos.c
index ee827a7f7c6a..b6ad3ac5916e 100644
--- a/trunk/drivers/crypto/talitos.c
+++ b/trunk/drivers/crypto/talitos.c
@@ -1157,6 +1157,8 @@ static int aead_authenc_givencrypt(
 	edesc->desc.hdr = ctx->desc_hdr_template | DESC_HDR_MODE0_ENCRYPT;
 
 	memcpy(req->giv, ctx->iv, crypto_aead_ivsize(authenc));
+	/* avoid consecutive packets going out with same IV */
+	*(__be64 *)req->giv ^= cpu_to_be64(req->seq);
 
 	return ipsec_esp(edesc, areq, req->giv, req->seq,
 			 ipsec_esp_encrypt_done);
@@ -1449,6 +1451,8 @@ static int talitos_probe(struct of_device *ofdev,
 
 	priv->ofdev = ofdev;
 
+	INIT_LIST_HEAD(&priv->alg_list);
+
 	tasklet_init(&priv->done_task, talitos_done, (unsigned long)dev);
 	tasklet_init(&priv->error_task, talitos_error, (unsigned long)dev);
 
@@ -1575,8 +1579,6 @@ static int talitos_probe(struct of_device *ofdev,
 	}
 
 	/* register crypto algorithms the device supports */
-	INIT_LIST_HEAD(&priv->alg_list);
-
 	for (i = 0; i < ARRAY_SIZE(driver_algs); i++) {
 		if (hw_supports(dev, driver_algs[i].desc_hdr_template)) {
 			struct talitos_crypto_alg *t_alg;