Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (32 commits)
  [NetLabel]: correct usage of RCU locking
  [TCP]: fix D-SACK cwnd handling
  [NET] napi: use non-interruptible sleep in napi_disable
  [SCTP] net/sctp/auth.c: make 3 functions static
  [TCP]: Add missing I/O AT code to ipv6 side.
  [SCTP]: #if 0 sctp_update_copy_cksum()
  [INET]: Unexport icmpmsg_statistics
  [NET]: Unexport sock_enable_timestamp().
  [TCP]: Make tcp_match_skb_to_sack() static.
  [IRDA]: Make ircomm_tty static.
  [NET] fs/proc/proc_net.c: make a struct static
  [NET] dev_change_name: ignore changes to same name
  [NET]: Document some simple rules for actions
  [NET_CLS_ACT]: Use skb_act_clone
  [NET_CLS_ACT]: Introduce skb_act_clone
  [TCP]: Fix scatterlist handling in MD5 signature support.
  [IPSEC]: Fix scatterlist handling in skb_icv_walk().
  [IPSEC]: Add missing sg_init_table() calls to ESP.
  [CRYPTO]: Initialize TCRYPT on-stack scatterlist objects correctly.
  [CRYPTO]: HMAC needs some more scatterlist fixups.
  ...

2 files changed, 19 insertions, 15 deletions

diff --git a/crypto/hmac.c b/crypto/hmac.c
index 6691981bda..0f05be769c 100644
--- a/crypto/hmac.c
+++ b/crypto/hmac.c
@@ -61,7 +61,7 @@ static int hmac_setkey(struct crypto_hash *parent,
                 desc.tfm = tfm;
                 desc.flags = crypto_hash_get_flags(parent);
                 desc.flags &= CRYPTO_TFM_REQ_MAY_SLEEP;
-                sg_set_buf(&tmp, inkey, keylen);
+                sg_init_one(&tmp, inkey, keylen);
 
                 err = crypto_hash_digest(&desc, &tmp, keylen, digest);
                 if (err)
@@ -96,7 +96,7 @@ static int hmac_init(struct hash_desc *pdesc)
 
         desc.tfm = ctx->child;
         desc.flags = pdesc->flags & CRYPTO_TFM_REQ_MAY_SLEEP;
-        sg_set_buf(&tmp, ipad, bs);
+        sg_init_one(&tmp, ipad, bs);
 
         err = crypto_hash_init(&desc);
         if (unlikely(err))
@@ -131,7 +131,7 @@ static int hmac_final(struct hash_desc *pdesc, u8 *out)
 
         desc.tfm = ctx->child;
         desc.flags = pdesc->flags & CRYPTO_TFM_REQ_MAY_SLEEP;
-        sg_set_buf(&tmp, opad, bs + ds);
+        sg_init_one(&tmp, opad, bs + ds);
 
         err = crypto_hash_final(&desc, digest);
         if (unlikely(err))
@@ -158,9 +158,11 @@ static int hmac_digest(struct hash_desc *pdesc, struct scatterlist *sg,
         desc.tfm = ctx->child;
         desc.flags = pdesc->flags & CRYPTO_TFM_REQ_MAY_SLEEP;
 
+        sg_init_table(sg1, 2);
         sg_set_buf(sg1, ipad, bs);
+        sg_set_page(&sg1[1], (void *) sg, 0, 0);
 
-        sg_set_page(&sg[1], (void *) sg, 0, 0);
+        sg_init_table(sg2, 1);
         sg_set_buf(sg2, opad, bs + ds);
 
         err = crypto_hash_digest(&desc, sg1, nbytes + bs, digest);
diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c
index d741c63af4..c457bdb2a4 100644
--- a/crypto/tcrypt.c
+++ b/crypto/tcrypt.c
@@ -139,7 +139,7 @@ static void test_hash(char *algo, struct hash_testvec *template,
                 printk("test %u:\n", i + 1);
                 memset(result, 0, 64);
 
-                sg_set_buf(&sg[0], hash_tv[i].plaintext, hash_tv[i].psize);
+                sg_init_one(&sg[0], hash_tv[i].plaintext, hash_tv[i].psize);
 
                 if (hash_tv[i].ksize) {
                         ret = crypto_hash_setkey(tfm, hash_tv[i].key,
@@ -176,6 +176,7 @@ static void test_hash(char *algo, struct hash_testvec *template,
                         memset(result, 0, 64);
 
                         temp = 0;
+                        sg_init_table(sg, hash_tv[i].np);
                         for (k = 0; k < hash_tv[i].np; k++) {
                                 memcpy(&xbuf[IDX[k]],
                                        hash_tv[i].plaintext + temp,
@@ -289,8 +290,8 @@ static void test_cipher(char *algo, int enc,
                                         goto out;
                         }
 
-                        sg_set_buf(&sg[0], cipher_tv[i].input,
-                                   cipher_tv[i].ilen);
+                        sg_init_one(&sg[0], cipher_tv[i].input,
+                                    cipher_tv[i].ilen);
 
                         ablkcipher_request_set_crypt(req, sg, sg,
                                                      cipher_tv[i].ilen,
@@ -353,6 +354,7 @@ static void test_cipher(char *algo, int enc,
                         }
 
                         temp = 0;
+                        sg_init_table(sg, cipher_tv[i].np);
                         for (k = 0; k < cipher_tv[i].np; k++) {
                                 memcpy(&xbuf[IDX[k]],
                                        cipher_tv[i].input + temp,
@@ -414,7 +416,7 @@ static int test_cipher_jiffies(struct blkcipher_desc *desc, int enc, char *p,
         int bcount;
         int ret;
 
-        sg_set_buf(sg, p, blen);
+        sg_init_one(sg, p, blen);
 
         for (start = jiffies, end = start + sec * HZ, bcount = 0;
              time_before(jiffies, end); bcount++) {
@@ -440,7 +442,7 @@ static int test_cipher_cycles(struct blkcipher_desc *desc, int enc, char *p,
         int ret = 0;
         int i;
 
-        sg_set_buf(sg, p, blen);
+        sg_init_one(sg, p, blen);
 
         local_bh_disable();
         local_irq_disable();
@@ -572,7 +574,7 @@ static int test_hash_jiffies_digest(struct hash_desc *desc, char *p, int blen,
 
         for (start = jiffies, end = start + sec * HZ, bcount = 0;
              time_before(jiffies, end); bcount++) {
-                sg_set_buf(sg, p, blen);
+                sg_init_one(sg, p, blen);
                 ret = crypto_hash_digest(desc, sg, blen, out);
                 if (ret)
                         return ret;
@@ -601,7 +603,7 @@ static int test_hash_jiffies(struct hash_desc *desc, char *p, int blen,
                 if (ret)
                         return ret;
                 for (pcount = 0; pcount < blen; pcount += plen) {
-                        sg_set_buf(sg, p + pcount, plen);
+                        sg_init_one(sg, p + pcount, plen);
                         ret = crypto_hash_update(desc, sg, plen);
                         if (ret)
                                 return ret;
@@ -631,7 +633,7 @@ static int test_hash_cycles_digest(struct hash_desc *desc, char *p, int blen,
 
         /* Warm-up run. */
         for (i = 0; i < 4; i++) {
-                sg_set_buf(sg, p, blen);
+                sg_init_one(sg, p, blen);
                 ret = crypto_hash_digest(desc, sg, blen, out);
                 if (ret)
                         goto out;
@@ -643,7 +645,7 @@ static int test_hash_cycles_digest(struct hash_desc *desc, char *p, int blen,
 
                 start = get_cycles();
 
-                sg_set_buf(sg, p, blen);
+                sg_init_one(sg, p, blen);
                 ret = crypto_hash_digest(desc, sg, blen, out);
                 if (ret)
                         goto out;
@@ -686,7 +688,7 @@ static int test_hash_cycles(struct hash_desc *desc, char *p, int blen,
                 if (ret)
                         goto out;
                 for (pcount = 0; pcount < blen; pcount += plen) {
-                        sg_set_buf(sg, p + pcount, plen);
+                        sg_init_one(sg, p + pcount, plen);
                         ret = crypto_hash_update(desc, sg, plen);
                         if (ret)
                                 goto out;
@@ -706,7 +708,7 @@ static int test_hash_cycles(struct hash_desc *desc, char *p, int blen,
                 if (ret)
                         goto out;
                 for (pcount = 0; pcount < blen; pcount += plen) {
-                        sg_set_buf(sg, p + pcount, plen);
+                        sg_init_one(sg, p + pcount, plen);
                         ret = crypto_hash_update(desc, sg, plen);
                         if (ret)
                                 goto out;