]> err.no Git - linux-2.6/commitdiff
[CRYPTO] lrw: round --> lrw_round
authorDavid S. Miller <davem@sunset.davemloft.net>
Tue, 5 Dec 2006 04:20:05 +0000 (20:20 -0800)
committerDavid S. Miller <davem@sunset.davemloft.net>
Thu, 7 Dec 2006 02:39:00 +0000 (18:39 -0800)
Fixes:

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

Signed-off-by: David S. Miller <davem@davemloft.net>
crypto/lrw.c

index 5d043158b9030eb806c829205b7dd256d632e4b6..56642586d84f733b547e1a8ebef539de4a93e760 100644 (file)
@@ -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;