diff options
| author | Scott Wood <scottwood@freescale.com> | 2014-04-08 21:20:01 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-04-08 21:20:01 (GMT) |
| commit | 46864e3149aabfe369f1c469951909b9dc7d53bf (patch) | |
| tree | 5a57c938836d6f2853beaa123d568d128ab76349 /net/ipv4 | |
| parent | 63f2cd32fb5f8541636f47cc4c7c53cf8284851f (diff) | |
| parent | 948a4eec975b0f231c6a55eaaff3e3bdcf4cdf70 (diff) | |
| download | linux-fsl-qoriq-46864e3149aabfe369f1c469951909b9dc7d53bf.tar.xz | |
Merge branch 'sdk-kernel-3.12' into sdk-v1.6.x
Diffstat (limited to 'net/ipv4')
| -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 531ab57..3b8f542 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -1425,7 +1425,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; @@ -1433,7 +1433,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); } |