From 4a96aa47788c24000599e7527f72609d3dd1d247 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Thu, 8 Nov 2012 10:01:01 +0000 Subject: [PATCH] --- yaml --- r: 358494 b: refs/heads/master c: e239345f642e6a255d0ba1e3d92c2f9ec5a44fbe h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/dmaengine.h | 5 +---- trunk/net/ipv4/tcp.c | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index dc076aeb9399..ae93def5d632 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b9ee86830f34737a08deead93872a79a37419a13 +refs/heads/master: e239345f642e6a255d0ba1e3d92c2f9ec5a44fbe diff --git a/trunk/include/linux/dmaengine.h b/trunk/include/linux/dmaengine.h index cd15958d4d1d..4ca9cf73ad3f 100644 --- a/trunk/include/linux/dmaengine.h +++ b/trunk/include/linux/dmaengine.h @@ -926,16 +926,13 @@ static inline enum dma_status dma_async_is_tx_complete(struct dma_chan *chan, return status; } -#define dma_async_memcpy_complete(chan, cookie, last, used)\ - dma_async_is_tx_complete(chan, cookie, last, used) - /** * dma_async_is_complete - test a cookie against chan state * @cookie: transaction identifier to test status of * @last_complete: last know completed transaction * @last_used: last cookie value handed out * - * dma_async_is_complete() is used in dma_async_memcpy_complete() + * dma_async_is_complete() is used in dma_async_is_tx_complete() * the test logic is separated for lightweight testing of multiple cookies */ static inline enum dma_status dma_async_is_complete(dma_cookie_t cookie, diff --git a/trunk/net/ipv4/tcp.c b/trunk/net/ipv4/tcp.c index cf949a119a54..db0856ad70cb 100644 --- a/trunk/net/ipv4/tcp.c +++ b/trunk/net/ipv4/tcp.c @@ -1409,7 +1409,7 @@ static void tcp_service_net_dma(struct sock *sk, bool wait) dma_async_issue_pending(tp->ucopy.dma_chan); do { - if (dma_async_memcpy_complete(tp->ucopy.dma_chan, + if (dma_async_is_tx_complete(tp->ucopy.dma_chan, last_issued, &done, &used) == DMA_SUCCESS) { /* Safe to free early-copied skbs now */