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/ipv6/tcp_ipv6.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/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 e8b8337a8310..71cd70951d7d 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c | |||
@@ -1640,7 +1640,7 @@ process: | |||
1640 | #ifdef CONFIG_NET_DMA | 1640 | #ifdef CONFIG_NET_DMA |
1641 | struct tcp_sock *tp = tcp_sk(sk); | 1641 | struct tcp_sock *tp = tcp_sk(sk); |
1642 | if (!tp->ucopy.dma_chan && tp->ucopy.pinned_list) | 1642 | if (!tp->ucopy.dma_chan && tp->ucopy.pinned_list) |
1643 | tp->ucopy.dma_chan = get_softnet_dma(); | 1643 | tp->ucopy.dma_chan = dma_find_channel(DMA_MEMCPY); |
1644 | if (tp->ucopy.dma_chan) | 1644 | if (tp->ucopy.dma_chan) |
1645 | ret = tcp_v6_do_rcv(sk, skb); | 1645 | ret = tcp_v6_do_rcv(sk, skb); |
1646 | else | 1646 | else |