diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-01-17 12:01:12 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-01-17 12:01:12 +0100 |
| commit | d1a020050c6ce1a0794ff73582ccf47e4db536f7 (patch) | |
| tree | 1b7250410f24703cd77c76156e758db9887137aa /net/ipv4/tcp_input.c | |
| parent | dc61b66fc724f89d357c43e2319d2cb7bec1e517 (diff) | |
| parent | 641b4879444c0edb276fedca5c2fcbd2e5c70044 (diff) | |
| download | lwn-d1a020050c6ce1a0794ff73582ccf47e4db536f7.tar.gz lwn-d1a020050c6ce1a0794ff73582ccf47e4db536f7.zip | |
Merge branch 'topic/usb-mixer-cache' into next/usb-audio
Diffstat (limited to 'net/ipv4/tcp_input.c')
| -rw-r--r-- | net/ipv4/tcp_input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 99b7ecbe8893..a6961d75c7ea 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -5005,7 +5005,7 @@ static int tcp_dma_try_early_copy(struct sock *sk, struct sk_buff *skb, return 0; if (!tp->ucopy.dma_chan && tp->ucopy.pinned_list) - tp->ucopy.dma_chan = get_softnet_dma(); + tp->ucopy.dma_chan = dma_find_channel(DMA_MEMCPY); if (tp->ucopy.dma_chan && skb_csum_unnecessary(skb)) { |