---

yaml --- r: 72622 b: refs/heads/master c: b4caea8 h: refs/heads/master v: v3
git-mirror · Oct 26, 2007 · 67e648d · 67e648d
1 parent 4d58f95
commit 67e648d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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