diff options
author | Dan Williams <dan.j.williams@intel.com> | 2009-01-06 13:38:15 -0500 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2009-01-06 13:38:15 -0500 |
commit | f67b45999205164958de4ec0658d51fa4bee066d (patch) | |
tree | 2fc3c2e833fdfea2f029dca05d5401ba9ae63229 /net/ipv4/tcp.c | |
parent | 2ba05622b8b143b0c95968ba59bddfbd6d2f2559 (diff) |
net_dma: convert to dma_find_channel
Use the general-purpose channel allocation provided by dmaengine.
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'net/ipv4/tcp.c')
-rw-r--r-- | net/ipv4/tcp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 75e0e0a2d8db..9b275abc8eb9 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c | |||
@@ -1317,7 +1317,7 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, | |||
1317 | if ((available < target) && | 1317 | if ((available < target) && |
1318 | (len > sysctl_tcp_dma_copybreak) && !(flags & MSG_PEEK) && | 1318 | (len > sysctl_tcp_dma_copybreak) && !(flags & MSG_PEEK) && |
1319 | !sysctl_tcp_low_latency && | 1319 | !sysctl_tcp_low_latency && |
1320 | __get_cpu_var(softnet_data).net_dma) { | 1320 | dma_find_channel(DMA_MEMCPY)) { |
1321 | preempt_enable_no_resched(); | 1321 | preempt_enable_no_resched(); |
1322 | tp->ucopy.pinned_list = | 1322 | tp->ucopy.pinned_list = |
1323 | dma_pin_iovec_pages(msg->msg_iov, len); | 1323 | dma_pin_iovec_pages(msg->msg_iov, len); |
@@ -1527,7 +1527,7 @@ do_prequeue: | |||
1527 | if (!(flags & MSG_TRUNC)) { | 1527 | if (!(flags & MSG_TRUNC)) { |
1528 | #ifdef CONFIG_NET_DMA | 1528 | #ifdef CONFIG_NET_DMA |
1529 | if (!tp->ucopy.dma_chan && tp->ucopy.pinned_list) | 1529 | if (!tp->ucopy.dma_chan && tp->ucopy.pinned_list) |
1530 | tp->ucopy.dma_chan = get_softnet_dma(); | 1530 | tp->ucopy.dma_chan = dma_find_channel(DMA_MEMCPY); |
1531 | 1531 | ||
1532 | if (tp->ucopy.dma_chan) { | 1532 | if (tp->ucopy.dma_chan) { |
1533 | tp->ucopy.dma_cookie = dma_skb_copy_datagram_iovec( | 1533 | tp->ucopy.dma_cookie = dma_skb_copy_datagram_iovec( |