diff options
| author | Dave Jiang <dave.jiang@intel.com> | 2012-04-04 16:10:46 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2012-04-05 15:27:12 -0700 |
| commit | a2bd1140a264b561e38d99e656cd843c2d840e86 (patch) | |
| tree | 9c9f19dde5c0213a52de0e77c16059062cc6c8a1 /net/ipv4/tcp_ipv4.c | |
| parent | f26df1a1a9452573af7b6cea9a4723593e838568 (diff) | |
| download | linux-stable-a2bd1140a264b561e38d99e656cd843c2d840e86.tar.gz linux-stable-a2bd1140a264b561e38d99e656cd843c2d840e86.tar.bz2 linux-stable-a2bd1140a264b561e38d99e656cd843c2d840e86.zip | |
netdma: adding alignment check for NETDMA ops
This is the fallout from adding memcpy alignment workaround for certain
IOATDMA hardware. NetDMA will only use DMA engine that can handle byte align
ops.
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Dave Jiang <dave.jiang@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'net/ipv4/tcp_ipv4.c')
| -rw-r--r-- | net/ipv4/tcp_ipv4.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index fd54c5f8a255..3810b6fe0a1e 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -1727,7 +1727,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_v4_do_rcv(sk, skb); else |