[CRYPTO] scatterwalk: Use generic scatterlist chaining

herbertx · herbertx · commit 468577abe37f · 2008-01-11T08:16:14.000+11:00
This patch converts the crypto scatterwalk code to use the generic
scatterlist chaining rather the version specific to crypto.

Signed-off-by: Herbert Xu &lt;herbert@gondor.apana.org.au&gt;
diff --git a/crypto/digest.c b/crypto/digest.c
@@ -21,7 +21,6 @@
 #include <linux/scatterlist.h>
 
 #include "internal.h"
-#include "scatterwalk.h"
 
 static int init(struct hash_desc *desc)
 {
@@ -77,7 +76,7 @@ static int update2(struct hash_desc *desc,
 
 		if (!nbytes)
 			break;
-		sg = scatterwalk_sg_next(sg);
+		sg = sg_next(sg);
 	}
 
 	return 0;
diff --git a/crypto/hmac.c b/crypto/hmac.c
@@ -160,7 +160,7 @@ static int hmac_digest(struct hash_desc *pdesc, struct scatterlist *sg,
 
 	sg_init_table(sg1, 2);
 	sg_set_buf(sg1, ipad, bs);
-	sg_set_page(&sg1[1], (void *) sg, 0, 0);
+	sg_chain(sg1, 2, sg);
 
 	sg_init_table(sg2, 1);
 	sg_set_buf(sg2, opad, bs + ds);
diff --git a/crypto/scatterwalk.c b/crypto/scatterwalk.c
@@ -62,7 +62,7 @@ static void scatterwalk_pagedone(struct scatter_walk *walk, int out,
 		walk->offset += PAGE_SIZE - 1;
 		walk->offset &= PAGE_MASK;
 		if (walk->offset >= walk->sg->offset + walk->sg->length)
-			scatterwalk_start(walk, scatterwalk_sg_next(walk->sg));
+			scatterwalk_start(walk, sg_next(walk->sg));
 	}
 }
 
diff --git a/crypto/scatterwalk.h b/crypto/scatterwalk.h
@@ -20,11 +20,6 @@
 
 #include "internal.h"
 
-static inline struct scatterlist *scatterwalk_sg_next(struct scatterlist *sg)
-{
-	return (++sg)->length ? sg : (void *) sg_page(sg);
-}
-
 static inline unsigned long scatterwalk_samebuf(struct scatter_walk *walk_in,
 						struct scatter_walk *walk_out)
 {

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@`
`21`	`21`	`#include <linux/scatterlist.h>`
`22`	`22`
`23`	`23`	`#include "internal.h"`
`24`		`-#include "scatterwalk.h"`
`25`	`24`
`26`	`25`	`static int init(struct hash_desc *desc)`
`27`	`26`	`{`
`@@ -77,7 +76,7 @@ static int update2(struct hash_desc *desc,`
`77`	`76`
`78`	`77`	`if (!nbytes)`
`79`	`78`	`break;`
`80`		`- sg = scatterwalk_sg_next(sg);`
	`79`	`+ sg = sg_next(sg);`
`81`	`80`	`}`
`82`	`81`
`83`	`82`	`return 0;`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ static void scatterwalk_pagedone(struct scatter_walk *walk, int out,`
`62`	`62`	`walk->offset += PAGE_SIZE - 1;`
`63`	`63`	`walk->offset &= PAGE_MASK;`
`64`	`64`	`if (walk->offset >= walk->sg->offset + walk->sg->length)`
`65`		`- scatterwalk_start(walk, scatterwalk_sg_next(walk->sg));`
	`65`	`+ scatterwalk_start(walk, sg_next(walk->sg));`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`