2 files changed, 3 insertions, 6 deletions

diff --git a/net/sctp/auth.c b/net/sctp/auth.c
index c9dbc3afa9..8af1004abe 100644
--- a/net/sctp/auth.c
+++ b/net/sctp/auth.c
@@ -726,8 +726,7 @@ void sctp_auth_calculate_hmac(const struct sctp_association *asoc,
 
         /* set up scatter list */
         end = skb_tail_pointer(skb);
-        sg_init_table(&sg, 1);
-        sg_set_buf(&sg, auth, end - (unsigned char *)auth);
+        sg_init_one(&sg, auth, end - (unsigned char *)auth);
 
         desc.tfm = asoc->ep->auth_hmacs[hmac_id];
         desc.flags = 0;
diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c
index c055212875..c377e4e8f6 100644
--- a/net/sctp/sm_make_chunk.c
+++ b/net/sctp/sm_make_chunk.c
@@ -1513,8 +1513,7 @@ static sctp_cookie_param_t *sctp_pack_cookie(const struct sctp_endpoint *ep,
                 struct hash_desc desc;
 
                 /* Sign the message.  */
-                sg_init_table(&sg, 1);
-                sg_set_buf(&sg, &cookie->c, bodysize);
+                sg_init_one(&sg, &cookie->c, bodysize);
                 keylen = SCTP_SECRET_SIZE;
                 key = (char *)ep->secret_key[ep->current_key];
                 desc.tfm = sctp_sk(ep->base.sk)->hmac;
@@ -1584,8 +1583,7 @@ struct sctp_association *sctp_unpack_cookie(
 
         /* Check the signature.  */
         keylen = SCTP_SECRET_SIZE;
-        sg_init_table(&sg, 1);
-        sg_set_buf(&sg, bear_cookie, bodysize);
+        sg_init_one(&sg, bear_cookie, bodysize);
         key = (char *)ep->secret_key[ep->current_key];
         desc.tfm = sctp_sk(ep->base.sk)->hmac;
         desc.flags = 0;