From 9ebed9d182e03d12d39915b72e4b960046bc4039 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Mon, 4 Dec 2006 20:20:05 -0800 Subject: [PATCH] [CRYPTO] lrw: round --> lrw_round MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Fixes: crypto/lrw.c:99: warning: conflicting types for built-in function ‘round’ Signed-off-by: David S. Miller --- crypto/lrw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crypto/lrw.c b/crypto/lrw.c index 5d04315..5664258 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; -- 2.7.4