diff options
| author | Scott Wood <scottwood@freescale.com> | 2014-04-08 21:06:11 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-04-08 21:06:11 (GMT) |
| commit | d0b794f24c934bb076ffd28df316798f1707cf13 (patch) | |
| tree | 0b5cf9ac0ae37705fc0defa6f43585a0d1285f21 /net | |
| parent | 47d2261a3fa71cde24263559a4219a25e50d8c89 (diff) | |
| download | linux-fsl-qoriq-d0b794f24c934bb076ffd28df316798f1707cf13.tar.xz | |
Fix build breaks in dma engine users
The dma engine was exempted from the 3.12 rollback because of
excessive conflicts. Some users needed to be adjusted (net/ipv4/tcp.c)
or exempted themselves (async_tx).
Signed-off-by: Scott Wood <scottwood@freescale.com>
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 6e5617b..d2652fb 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); } |