Merge branch 'for-2.6.30' into for-2.6.31

[pandora-kernel.git] / crypto / xcbc.c

diff --git a/crypto/xcbc.c b/crypto/xcbc.c
index 8672740..b63b633 100644 (file)
--- a/crypto/xcbc.c
+++ b/crypto/xcbc.c
@@ -116,13 +116,16 @@ static int crypto_xcbc_digest_update2(struct hash_desc *pdesc,
        struct crypto_xcbc_ctx *ctx = crypto_hash_ctx_aligned(parent);
        struct crypto_cipher *tfm = ctx->child;
        int bs = crypto_hash_blocksize(parent);
-       unsigned int i = 0;
 
-       do {
+       for (;;) {
+               struct page *pg = sg_page(sg);
+               unsigned int offset = sg->offset;
+               unsigned int slen = sg->length;
 
-               struct page *pg = sg_page(&sg[i]);
-               unsigned int offset = sg[i].offset;
-               unsigned int slen = sg[i].length;
+               if (unlikely(slen > nbytes))
+                       slen = nbytes;
+
+               nbytes -= slen;
 
                while (slen > 0) {
                        unsigned int len = min(slen, ((unsigned int)(PAGE_SIZE)) - offset);
@@ -177,9 +180,11 @@ static int crypto_xcbc_digest_update2(struct hash_desc *pdesc,
                        offset = 0;
                        pg++;
                }
-               nbytes-=sg[i].length;
-               i++;
-       } while (nbytes>0);
+
+               if (!nbytes)
+                       break;
+               sg = scatterwalk_sg_next(sg);
+       }
 
        return 0;
 }