aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/dmaengine.h5
-rw-r--r--net/ipv4/tcp.c2
2 files changed, 2 insertions, 5 deletions
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
index cd15958d4d1d..4ca9cf73ad3f 100644
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -926,16 +926,13 @@ static inline enum dma_status dma_async_is_tx_complete(struct dma_chan *chan,
926 return status; 926 return status;
927} 927}
928 928
929#define dma_async_memcpy_complete(chan, cookie, last, used)\
930 dma_async_is_tx_complete(chan, cookie, last, used)
931
932/** 929/**
933 * dma_async_is_complete - test a cookie against chan state 930 * dma_async_is_complete - test a cookie against chan state
934 * @cookie: transaction identifier to test status of 931 * @cookie: transaction identifier to test status of
935 * @last_complete: last know completed transaction 932 * @last_complete: last know completed transaction
936 * @last_used: last cookie value handed out 933 * @last_used: last cookie value handed out
937 * 934 *
938 * dma_async_is_complete() is used in dma_async_memcpy_complete() 935 * dma_async_is_complete() is used in dma_async_is_tx_complete()
939 * the test logic is separated for lightweight testing of multiple cookies 936 * the test logic is separated for lightweight testing of multiple cookies
940 */ 937 */
941static inline enum dma_status dma_async_is_complete(dma_cookie_t cookie, 938static inline enum dma_status dma_async_is_complete(dma_cookie_t cookie,
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index cf949a119a54..db0856ad70cb 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -1409,7 +1409,7 @@ static void tcp_service_net_dma(struct sock *sk, bool wait)
1409 dma_async_issue_pending(tp->ucopy.dma_chan); 1409 dma_async_issue_pending(tp->ucopy.dma_chan);
1410 1410
1411 do { 1411 do {
1412 if (dma_async_memcpy_complete(tp->ucopy.dma_chan, 1412 if (dma_async_is_tx_complete(tp->ucopy.dma_chan,
1413 last_issued, &done, 1413 last_issued, &done,
1414 &used) == DMA_SUCCESS) { 1414 &used) == DMA_SUCCESS) {
1415 /* Safe to free early-copied skbs now */ 1415 /* Safe to free early-copied skbs now */