diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2013-10-30 11:12:19 +0100 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2013-10-30 11:12:19 +0100 |
| commit | f0dad6e701cb66301287074c39183c7312139530 (patch) | |
| tree | b4a38d8dcc49206fcedae7192e898df1011a6810 /net | |
| parent | Merge branch 'for-linus' into next (diff) | |
| parent | dmaengine: remove unused DMA_SUCCESS (diff) | |
| download | linux-f0dad6e701cb66301287074c39183c7312139530.tar.xz linux-f0dad6e701cb66301287074c39183c7312139530.zip | |
Merge branch 'dma_complete' into next
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/tcp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 6e5617b9f9db..d2652fb3232e 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -1429,7 +1429,7 @@ static void tcp_service_net_dma(struct sock *sk, bool wait) do { if (dma_async_is_tx_complete(tp->ucopy.dma_chan, last_issued, &done, - &used) == DMA_SUCCESS) { + &used) == DMA_COMPLETE) { /* Safe to free early-copied skbs now */ __skb_queue_purge(&sk->sk_async_wait_queue); break; @@ -1437,7 +1437,7 @@ static void tcp_service_net_dma(struct sock *sk, bool wait) struct sk_buff *skb; while ((skb = skb_peek(&sk->sk_async_wait_queue)) && (dma_async_is_complete(skb->dma_cookie, done, - used) == DMA_SUCCESS)) { + used) == DMA_COMPLETE)) { __skb_dequeue(&sk->sk_async_wait_queue); kfree_skb(skb); } |