sunrpc: expiry_time should be seconds not timeval

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / crypto / salsa20_generic.c

diff --git a/crypto/salsa20_generic.c b/crypto/salsa20_generic.c
index f550b5d..319d996 100644 (file)
--- a/crypto/salsa20_generic.c
+++ b/crypto/salsa20_generic.c
@@ -186,14 +186,7 @@ static int encrypt(struct blkcipher_desc *desc,
        blkcipher_walk_init(&walk, dst, src, nbytes);
        err = blkcipher_walk_virt_block(desc, &walk, 64);
 
-       salsa20_ivsetup(ctx, walk.iv);
-
-       if (likely(walk.nbytes == nbytes))
-       {
-               salsa20_encrypt_bytes(ctx, walk.dst.virt.addr,
-                                     walk.src.virt.addr, nbytes);
-               return blkcipher_walk_done(desc, &walk, 0);
-       }
+       salsa20_ivsetup(ctx, desc->info);
 
        while (walk.nbytes >= 64) {
                salsa20_encrypt_bytes(ctx, walk.dst.virt.addr,