diff options
| author | Marcelo Tosatti <mtosatti@redhat.com> | 2012-04-19 17:06:26 -0300 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2012-04-19 17:06:26 -0300 |
| commit | eac0556750e727ff39144a9a9e59d5ccf1fc0e2a (patch) | |
| tree | f5ccff7795b2ad5e47f17fb475599c526f533e79 /net/ipv6/tcp_ipv6.c | |
| parent | f71fa31f9f7ac33cba12b8897983f950ad2c7a5b (diff) | |
| parent | 19853301ef3289bda2d5264c1093e74efddaeab9 (diff) | |
Merge branch 'linus' into queue
Merge reason: development work has dependency on kvm patches merged
upstream.
Conflicts:
Documentation/feature-removal-schedule.txt
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
| -rw-r--r-- | net/ipv6/tcp_ipv6.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 12c6ece67f3..86cfe6005f4 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -1645,7 +1645,7 @@ process: #ifdef CONFIG_NET_DMA struct tcp_sock *tp = tcp_sk(sk); if (!tp->ucopy.dma_chan && tp->ucopy.pinned_list) - tp->ucopy.dma_chan = dma_find_channel(DMA_MEMCPY); + tp->ucopy.dma_chan = net_dma_find_channel(); if (tp->ucopy.dma_chan) ret = tcp_v6_do_rcv(sk, skb); else |