From 67e648d0ae2daaf68f8a548f40b75a9f043bf64b Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@sunset.davemloft.net>
Date: Fri, 26 Oct 2007 04:20:13 -0700
Subject: [PATCH] --- yaml --- r: 72622 b: refs/heads/master c:
 b4caea8aa8b4caeda2af6ef6b7f0d43c516815ee h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/net/ipv6/tcp_ipv6.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index caebd8119ec2..22c7bdb6eeb7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d84d64dcb3b54c900113f8dcd1240205ae164922
+refs/heads/master: b4caea8aa8b4caeda2af6ef6b7f0d43c516815ee
diff --git a/trunk/net/ipv6/tcp_ipv6.c b/trunk/net/ipv6/tcp_ipv6.c
index 32dc329762e9..06fa4baddf05 100644
--- a/trunk/net/ipv6/tcp_ipv6.c
+++ b/trunk/net/ipv6/tcp_ipv6.c
@@ -1732,6 +1732,8 @@ static int tcp_v6_rcv(struct sk_buff *skb)
 	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