aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorDave Jiang <dave.jiang@intel.com>2012-04-04 19:10:46 -0400
committerDan Williams <dan.j.williams@intel.com>2012-04-05 18:27:12 -0400
commita2bd1140a264b561e38d99e656cd843c2d840e86 (patch)
tree9c9f19dde5c0213a52de0e77c16059062cc6c8a1 /net/ipv6
parentf26df1a1a9452573af7b6cea9a4723593e838568 (diff)
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/ipv6')
-rw-r--r--net/ipv6/tcp_ipv6.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 3edd05ae438..fcb3e4f0010 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -1755,7 +1755,7 @@ process:
1755#ifdef CONFIG_NET_DMA 1755#ifdef CONFIG_NET_DMA
1756 struct tcp_sock *tp = tcp_sk(sk); 1756 struct tcp_sock *tp = tcp_sk(sk);
1757 if (!tp->ucopy.dma_chan && tp->ucopy.pinned_list) 1757 if (!tp->ucopy.dma_chan && tp->ucopy.pinned_list)
1758 tp->ucopy.dma_chan = dma_find_channel(DMA_MEMCPY); 1758 tp->ucopy.dma_chan = net_dma_find_channel();
1759 if (tp->ucopy.dma_chan) 1759 if (tp->ucopy.dma_chan)
1760 ret = tcp_v6_do_rcv(sk, skb); 1760 ret = tcp_v6_do_rcv(sk, skb);
1761 else 1761 else