diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-11 04:45:50 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-11 04:45:50 +0100 |
| commit | e8b722f487589a1f60ca27adc695494f188d404e (patch) | |
| tree | be3897dceb9b7c0949a8917ab11eea2752375e3b /include/net/netdma.h | |
| parent | 01d07820a0df6b6134c1bb75b1e84c9d0cdab3be (diff) | |
| parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) | |
| download | op-kernel-dev-e8b722f487589a1f60ca27adc695494f188d404e.zip op-kernel-dev-e8b722f487589a1f60ca27adc695494f188d404e.tar.gz | |
Merge commit 'v2.6.29-rc1' into irq/urgent
Diffstat (limited to 'include/net/netdma.h')
| -rw-r--r-- | include/net/netdma.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/include/net/netdma.h b/include/net/netdma.h index f28c6e0..8ba8ce2 100644 --- a/include/net/netdma.h +++ b/include/net/netdma.h @@ -24,17 +24,6 @@ #include <linux/dmaengine.h> #include <linux/skbuff.h> -static inline struct dma_chan *get_softnet_dma(void) -{ - struct dma_chan *chan; - rcu_read_lock(); - chan = rcu_dereference(__get_cpu_var(softnet_data).net_dma); - if (chan) - dma_chan_get(chan); - rcu_read_unlock(); - return chan; -} - int dma_skb_copy_datagram_iovec(struct dma_chan* chan, struct sk_buff *skb, int offset, struct iovec *to, size_t len, struct dma_pinned_list *pinned_list); |
