V4L/DVB (4898): Saa7134: add support for remote control of Hauppauge HVR1110

[~andy/linux] / crypto / lrw.c

diff --git a/crypto/lrw.c b/crypto/lrw.c
index 5d043158b9030eb806c829205b7dd256d632e4b6..56642586d84f733b547e1a8ebef539de4a93e760 100644 (file)
--- 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;