From: David S. Miller <davem@sunset.davemloft.net>
Date: Tue, 5 Dec 2006 04:20:05 +0000 (-0800)
Subject: [CRYPTO] lrw: round --> lrw_round
X-Git-Tag: v2.6.20-rc1~145^2^2~7^2~28
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9ebed9d182e03d12d39915b72e4b960046bc4039;p=karo-tx-linux.git

[CRYPTO] lrw: round --> lrw_round

Fixes:

crypto/lrw.c:99: warning: conflicting types for built-in function ‘round’

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/crypto/lrw.c b/crypto/lrw.c
index 5d043158b903..56642586d84f 100644
--- a/crypto/lrw.c
+++ b/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;