diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2006-12-04 23:20:05 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-06 21:39:00 -0500 |
commit | 9ebed9d182e03d12d39915b72e4b960046bc4039 (patch) | |
tree | bfed471e19944a3e5843c6f63af8f7dc890b359c /crypto/lrw.c | |
parent | 8df3b0a219967080d9dc4b604b5fecacb6967af0 (diff) |
[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/lrw.c')
-rw-r--r-- | crypto/lrw.c | 4 |
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) | |||
95 | iv->a = cpu_to_be64(be64_to_cpu(iv->a) + 1); | 95 | iv->a = cpu_to_be64(be64_to_cpu(iv->a) + 1); |
96 | } | 96 | } |
97 | 97 | ||
98 | static inline void round(struct sinfo *s, void *dst, const void *src) | 98 | static inline void lrw_round(struct sinfo *s, void *dst, const void *src) |
99 | { | 99 | { |
100 | be128_xor(dst, &s->t, src); /* PP <- T xor P */ | 100 | be128_xor(dst, &s->t, src); /* PP <- T xor P */ |
101 | s->fn(s->tfm, dst, dst); /* CC <- E(Key2,PP) */ | 101 | s->fn(s->tfm, dst, dst); /* CC <- E(Key2,PP) */ |
@@ -160,7 +160,7 @@ static int crypt(struct blkcipher_desc *d, | |||
160 | inc(iv); | 160 | inc(iv); |
161 | 161 | ||
162 | first: | 162 | first: |
163 | round(&s, wdst, wsrc); | 163 | lrw_round(&s, wdst, wsrc); |
164 | 164 | ||
165 | wsrc += bs; | 165 | wsrc += bs; |
166 | wdst += bs; | 166 | wdst += bs; |