From e1b981dbea59e3ac9ba30cf65e439e1ef9f5f22a Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@sunset.davemloft.net>
Date: Mon, 4 Dec 2006 20:20:05 -0800
Subject: [PATCH] --- yaml --- r: 43167 b: refs/heads/master c:
 9ebed9d182e03d12d39915b72e4b960046bc4039 h: refs/heads/master i:   43165:
 dabb23069bcc2de9be4a9b8a2be6da5530161ca9   43163:
 b8b1067f9ca15d2981a77217e00a2c5439170176   43159:
 503ee8e3d507a6c20241a6c692cec5eef73cf966   43151:
 5c107d2e60ee4f156494b80be77127630a74e92e   43135:
 368ef0d6ed0ec46d41230654a14d058e9a5f4e5e v: v3

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

diff --git a/[refs] b/[refs]
index 10032d722999..701314835ac5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8df3b0a219967080d9dc4b604b5fecacb6967af0
+refs/heads/master: 9ebed9d182e03d12d39915b72e4b960046bc4039
diff --git a/trunk/crypto/lrw.c b/trunk/crypto/lrw.c
index 5d043158b903..56642586d84f 100644
--- a/trunk/crypto/lrw.c
+++ b/trunk/crypto/lrw.c
@@ -95,7 +95,7 @@ static inline void inc(be128 *iv)
 		iv->a = cpu_to_be64(be64_to_cpu(iv->a) + 1);
 }
 
-static inline void round(struct sinfo *s, void *dst, const void *src)
+static inline void lrw_round(struct sinfo *s, void *dst, const void *src)
 {
 	be128_xor(dst, &s->t, src);		/* PP <- T xor P */
 	s->fn(s->tfm, dst, dst);		/* CC <- E(Key2,PP) */
@@ -160,7 +160,7 @@ static int crypt(struct blkcipher_desc *d,
 			inc(iv);
 
 first:
-			round(&s, wdst, wsrc);
+			lrw_round(&s, wdst, wsrc);
 
 			wsrc += bs;
 			wdst += bs;