1 files changed, 6 insertions, 0 deletions

diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 737b755342bd..06fa4baddf05 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -757,6 +757,8 @@ static int tcp_v6_do_calc_md5_hash(char *md5_hash, struct tcp_md5sig_key *key,
         bp->len = htonl(tcplen);
         bp->protocol = htonl(protocol);
 
+        sg_init_table(sg, 4);
+
         sg_set_buf(&sg[block++], bp, sizeof(*bp));
         nbytes += sizeof(*bp);
 
@@ -778,6 +780,8 @@ static int tcp_v6_do_calc_md5_hash(char *md5_hash, struct tcp_md5sig_key *key,
         sg_set_buf(&sg[block++], key->key, key->keylen);
         nbytes += key->keylen;
 
+        sg_mark_end(sg, block);
+
         /* Now store the hash into the packet */
         err = crypto_hash_init(desc);
         if (err) {
@@ -1728,6 +1732,8 @@ process:
         if (!sock_owned_by_user(sk)) {
 #ifdef CONFIG_NET_DMA
                 struct tcp_sock *tp = tcp_sk(sk);
+                if (!tp->ucopy.dma_chan && tp->ucopy.pinned_list)
+                        tp->ucopy.dma_chan = get_softnet_dma();
                 if (tp->ucopy.dma_chan)
                         ret = tcp_v6_do_rcv(sk, skb);
                 else