diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2013-10-30 06:12:19 -0400 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2013-10-30 06:12:19 -0400 |
| commit | f0dad6e701cb66301287074c39183c7312139530 (patch) | |
| tree | b4a38d8dcc49206fcedae7192e898df1011a6810 /net | |
| parent | b967aecf1714c10d1e6c045e43b6385884f1ca77 (diff) | |
| parent | 7db5f7274a0b065abdc358be2a44b4a911d75707 (diff) | |
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) | |||
| 1429 | do { | 1429 | do { |
| 1430 | if (dma_async_is_tx_complete(tp->ucopy.dma_chan, | 1430 | if (dma_async_is_tx_complete(tp->ucopy.dma_chan, |
| 1431 | last_issued, &done, | 1431 | last_issued, &done, |
| 1432 | &used) == DMA_SUCCESS) { | 1432 | &used) == DMA_COMPLETE) { |
| 1433 | /* Safe to free early-copied skbs now */ | 1433 | /* Safe to free early-copied skbs now */ |
| 1434 | __skb_queue_purge(&sk->sk_async_wait_queue); | 1434 | __skb_queue_purge(&sk->sk_async_wait_queue); |
| 1435 | break; | 1435 | break; |
| @@ -1437,7 +1437,7 @@ static void tcp_service_net_dma(struct sock *sk, bool wait) | |||
| 1437 | struct sk_buff *skb; | 1437 | struct sk_buff *skb; |
| 1438 | while ((skb = skb_peek(&sk->sk_async_wait_queue)) && | 1438 | while ((skb = skb_peek(&sk->sk_async_wait_queue)) && |
| 1439 | (dma_async_is_complete(skb->dma_cookie, done, | 1439 | (dma_async_is_complete(skb->dma_cookie, done, |
| 1440 | used) == DMA_SUCCESS)) { | 1440 | used) == DMA_COMPLETE)) { |
| 1441 | __skb_dequeue(&sk->sk_async_wait_queue); | 1441 | __skb_dequeue(&sk->sk_async_wait_queue); |
| 1442 | kfree_skb(skb); | 1442 | kfree_skb(skb); |
| 1443 | } | 1443 | } |