summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2006-12-05 05:20:05 +0100
committerDavid S. Miller <davem@sunset.davemloft.net>2006-12-07 03:39:00 +0100
commit9ebed9d182e03d12d39915b72e4b960046bc4039 (patch)
treebfed471e19944a3e5843c6f63af8f7dc890b359c /crypto
parent[CRYPTO] cryptoloop: Select CRYPTO_CBC (diff)
downloadlinux-9ebed9d182e03d12d39915b72e4b960046bc4039.tar.xz
linux-9ebed9d182e03d12d39915b72e4b960046bc4039.zip
[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>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/lrw.c4
1 files changed, 2 insertions, 2 deletions
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;