aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp.c
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/ipv4/tcp.c
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/ipv4/tcp.c')
-rw-r--r--net/ipv4/tcp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 22ef5f9fd2ff..8712c5d4f91d 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -1450,7 +1450,7 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
1450 if ((available < target) && 1450 if ((available < target) &&
1451 (len > sysctl_tcp_dma_copybreak) && !(flags & MSG_PEEK) && 1451 (len > sysctl_tcp_dma_copybreak) && !(flags & MSG_PEEK) &&
1452 !sysctl_tcp_low_latency && 1452 !sysctl_tcp_low_latency &&
1453 dma_find_channel(DMA_MEMCPY)) { 1453 net_dma_find_channel()) {
1454 preempt_enable_no_resched(); 1454 preempt_enable_no_resched();
1455 tp->ucopy.pinned_list = 1455 tp->ucopy.pinned_list =
1456 dma_pin_iovec_pages(msg->msg_iov, len); 1456 dma_pin_iovec_pages(msg->msg_iov, len);
@@ -1665,7 +1665,7 @@ do_prequeue:
1665 if (!(flags & MSG_TRUNC)) { 1665 if (!(flags & MSG_TRUNC)) {
1666#ifdef CONFIG_NET_DMA 1666#ifdef CONFIG_NET_DMA
1667 if (!tp->ucopy.dma_chan && tp->ucopy.pinned_list) 1667 if (!tp->ucopy.dma_chan && tp->ucopy.pinned_list)
1668 tp->ucopy.dma_chan = dma_find_channel(DMA_MEMCPY); 1668 tp->ucopy.dma_chan = net_dma_find_channel();
1669 1669
1670 if (tp->ucopy.dma_chan) { 1670 if (tp->ucopy.dma_chan) {
1671 tp->ucopy.dma_cookie = dma_skb_copy_datagram_iovec( 1671 tp->ucopy.dma_cookie = dma_skb_copy_datagram_iovec(