diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2006-12-04 20:20:05 -0800 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-06 18:39:00 -0800 |
| commit | 9ebed9d182e03d12d39915b72e4b960046bc4039 (patch) | |
| tree | bfed471e19944a3e5843c6f63af8f7dc890b359c /crypto | |
| parent | 8df3b0a219967080d9dc4b604b5fecacb6967af0 (diff) | |
| download | kernel_samsung_espresso10-9ebed9d182e03d12d39915b72e4b960046bc4039.zip kernel_samsung_espresso10-9ebed9d182e03d12d39915b72e4b960046bc4039.tar.gz kernel_samsung_espresso10-9ebed9d182e03d12d39915b72e4b960046bc4039.tar.bz2 | |
[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.c | 4 |
1 files 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; |