diff options
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/tcp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 7a5ba48c2cc9..47e854fcae24 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c | |||
@@ -1409,10 +1409,10 @@ static void tcp_service_net_dma(struct sock *sk, bool wait) | |||
1409 | return; | 1409 | return; |
1410 | 1410 | ||
1411 | last_issued = tp->ucopy.dma_cookie; | 1411 | last_issued = tp->ucopy.dma_cookie; |
1412 | dma_async_memcpy_issue_pending(tp->ucopy.dma_chan); | 1412 | dma_async_issue_pending(tp->ucopy.dma_chan); |
1413 | 1413 | ||
1414 | do { | 1414 | do { |
1415 | if (dma_async_memcpy_complete(tp->ucopy.dma_chan, | 1415 | if (dma_async_is_tx_complete(tp->ucopy.dma_chan, |
1416 | last_issued, &done, | 1416 | last_issued, &done, |
1417 | &used) == DMA_SUCCESS) { | 1417 | &used) == DMA_SUCCESS) { |
1418 | /* Safe to free early-copied skbs now */ | 1418 | /* Safe to free early-copied skbs now */ |
@@ -1754,7 +1754,7 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, | |||
1754 | tcp_service_net_dma(sk, true); | 1754 | tcp_service_net_dma(sk, true); |
1755 | tcp_cleanup_rbuf(sk, copied); | 1755 | tcp_cleanup_rbuf(sk, copied); |
1756 | } else | 1756 | } else |
1757 | dma_async_memcpy_issue_pending(tp->ucopy.dma_chan); | 1757 | dma_async_issue_pending(tp->ucopy.dma_chan); |
1758 | } | 1758 | } |
1759 | #endif | 1759 | #endif |
1760 | if (copied >= target) { | 1760 | if (copied >= target) { |
@@ -1847,7 +1847,7 @@ do_prequeue: | |||
1847 | break; | 1847 | break; |
1848 | } | 1848 | } |
1849 | 1849 | ||
1850 | dma_async_memcpy_issue_pending(tp->ucopy.dma_chan); | 1850 | dma_async_issue_pending(tp->ucopy.dma_chan); |
1851 | 1851 | ||
1852 | if ((offset + used) == skb->len) | 1852 | if ((offset + used) == skb->len) |
1853 | copied_early = true; | 1853 | copied_early = true; |