diff options
| author | David S. Miller <davem@davemloft.net> | 2012-04-12 19:41:23 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-12 19:41:23 -0400 |
| commit | 011e3c63251be832d23df9f0697626ab7b354d02 (patch) | |
| tree | 2cad5b58c274c93ae49d9b58fb15d784d4dfd78f /net/ipv6/tcp_ipv6.c | |
| parent | c1412fce7eccae62b4de22494f6ab3ff8a90c0c6 (diff) | |
| parent | ecca5c3acc0d0933d89abc44e60afb0cc8170e35 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
| -rw-r--r-- | net/ipv6/tcp_ipv6.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 12c6ece67f39..86cfe6005f40 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c | |||
| @@ -1645,7 +1645,7 @@ process: | |||
| 1645 | #ifdef CONFIG_NET_DMA | 1645 | #ifdef CONFIG_NET_DMA |
| 1646 | struct tcp_sock *tp = tcp_sk(sk); | 1646 | struct tcp_sock *tp = tcp_sk(sk); |
| 1647 | if (!tp->ucopy.dma_chan && tp->ucopy.pinned_list) | 1647 | if (!tp->ucopy.dma_chan && tp->ucopy.pinned_list) |
| 1648 | tp->ucopy.dma_chan = dma_find_channel(DMA_MEMCPY); | 1648 | tp->ucopy.dma_chan = net_dma_find_channel(); |
| 1649 | if (tp->ucopy.dma_chan) | 1649 | if (tp->ucopy.dma_chan) |
| 1650 | ret = tcp_v6_do_rcv(sk, skb); | 1650 | ret = tcp_v6_do_rcv(sk, skb); |
| 1651 | else | 1651 | else |