Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6

2 files changed, 9 insertions, 24 deletions

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index a970b4727ce8..41edc14851e8 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -75,7 +75,7 @@
 #ifdef CONFIG_IPV6_PRIVACY
 #include <linux/random.h>
 #include <linux/crypto.h>
-#include <asm/scatterlist.h>
+#include <linux/scatterlist.h>
 #endif
 
 #include <asm/uaccess.h>
@@ -1217,12 +1217,8 @@ static int __ipv6_regen_rndid(struct inet6_dev *idev)
         struct net_device *dev;
         struct scatterlist sg[2];
 
-        sg[0].page = virt_to_page(idev->entropy);
-        sg[0].offset = offset_in_page(idev->entropy);
-        sg[0].length = 8;
-        sg[1].page = virt_to_page(idev->work_eui64);
-        sg[1].offset = offset_in_page(idev->work_eui64);
-        sg[1].length = 8;
+        sg_set_buf(&sg[0], idev->entropy, 8);
+        sg_set_buf(&sg[1], idev->work_eui64, 8);
 
         dev = idev->dev;
 
diff --git a/net/sunrpc/auth_gss/gss_krb5_crypto.c b/net/sunrpc/auth_gss/gss_krb5_crypto.c
index 3f3d5437f02d..97c981fa6b8e 100644
--- a/net/sunrpc/auth_gss/gss_krb5_crypto.c
+++ b/net/sunrpc/auth_gss/gss_krb5_crypto.c
@@ -37,7 +37,7 @@
 #include <linux/types.h>
 #include <linux/mm.h>
 #include <linux/slab.h>
-#include <asm/scatterlist.h>
+#include <linux/scatterlist.h>
 #include <linux/crypto.h>
 #include <linux/highmem.h>
 #include <linux/pagemap.h>
@@ -75,9 +75,7 @@ krb5_encrypt(
                 memcpy(local_iv, iv, crypto_tfm_alg_ivsize(tfm));
 
         memcpy(out, in, length);
-        sg[0].page = virt_to_page(out);
-        sg[0].offset = offset_in_page(out);
-        sg[0].length = length;
+        sg_set_buf(sg, out, length);
 
         ret = crypto_cipher_encrypt_iv(tfm, sg, sg, length, local_iv);
 
@@ -117,9 +115,7 @@ krb5_decrypt(
                 memcpy(local_iv,iv, crypto_tfm_alg_ivsize(tfm));
 
         memcpy(out, in, length);
-        sg[0].page = virt_to_page(out);
-        sg[0].offset = offset_in_page(out);
-        sg[0].length = length;
+        sg_set_buf(sg, out, length);
 
         ret = crypto_cipher_decrypt_iv(tfm, sg, sg, length, local_iv);
 
@@ -132,13 +128,6 @@ out:
 
 EXPORT_SYMBOL(krb5_decrypt);
 
-static void
-buf_to_sg(struct scatterlist *sg, char *ptr, int len) {
-        sg->page = virt_to_page(ptr);
-        sg->offset = offset_in_page(ptr);
-        sg->length = len;
-}
-
 static int
 process_xdr_buf(struct xdr_buf *buf, int offset, int len,
                 int (*actor)(struct scatterlist *, void *), void *data)
@@ -152,7 +141,7 @@ process_xdr_buf(struct xdr_buf *buf, int offset, int len,
                 thislen = buf->head[0].iov_len - offset;
                 if (thislen > len)
                         thislen = len;
-                buf_to_sg(sg, buf->head[0].iov_base + offset, thislen);
+                sg_set_buf(sg, buf->head[0].iov_base + offset, thislen);
                 ret = actor(sg, data);
                 if (ret)
                         goto out;
@@ -195,7 +184,7 @@ process_xdr_buf(struct xdr_buf *buf, int offset, int len,
                 thislen = buf->tail[0].iov_len - offset;
                 if (thislen > len)
                         thislen = len;
-                buf_to_sg(sg, buf->tail[0].iov_base + offset, thislen);
+                sg_set_buf(sg, buf->tail[0].iov_base + offset, thislen);
                 ret = actor(sg, data);
                 len -= thislen;
         }
@@ -241,7 +230,7 @@ make_checksum(s32 cksumtype, char *header, int hdrlen, struct xdr_buf *body,
                 goto out;
 
         crypto_digest_init(tfm);
-        buf_to_sg(sg, header, hdrlen);
+        sg_set_buf(sg, header, hdrlen);
         crypto_digest_update(tfm, sg, 1);
         process_xdr_buf(body, body_offset, body->len - body_offset,
                         checksummer, tfm);