aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp_input.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_input.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_input.c')
-rw-r--r--net/ipv4/tcp_input.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index b5e315f13641..27c676dfea33 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -5190,7 +5190,7 @@ static int tcp_dma_try_early_copy(struct sock *sk, struct sk_buff *skb,
5190 return 0; 5190 return 0;
5191 5191
5192 if (!tp->ucopy.dma_chan && tp->ucopy.pinned_list) 5192 if (!tp->ucopy.dma_chan && tp->ucopy.pinned_list)
5193 tp->ucopy.dma_chan = dma_find_channel(DMA_MEMCPY); 5193 tp->ucopy.dma_chan = net_dma_find_channel();
5194 5194
5195 if (tp->ucopy.dma_chan && skb_csum_unnecessary(skb)) { 5195 if (tp->ucopy.dma_chan && skb_csum_unnecessary(skb)) {
5196 5196