diff options
author | Dan Williams <dan.j.williams@intel.com> | 2009-01-06 13:38:15 -0500 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2009-01-06 13:38:15 -0500 |
commit | f67b45999205164958de4ec0658d51fa4bee066d (patch) | |
tree | 2fc3c2e833fdfea2f029dca05d5401ba9ae63229 /include | |
parent | 2ba05622b8b143b0c95968ba59bddfbd6d2f2559 (diff) |
net_dma: convert to dma_find_channel
Use the general-purpose channel allocation provided by dmaengine.
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/netdevice.h | 3 | ||||
-rw-r--r-- | include/net/netdma.h | 11 |
2 files changed, 0 insertions, 14 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 41e1224651cf..bac2c458d9b8 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
@@ -1113,9 +1113,6 @@ struct softnet_data | |||
1113 | struct sk_buff *completion_queue; | 1113 | struct sk_buff *completion_queue; |
1114 | 1114 | ||
1115 | struct napi_struct backlog; | 1115 | struct napi_struct backlog; |
1116 | #ifdef CONFIG_NET_DMA | ||
1117 | struct dma_chan *net_dma; | ||
1118 | #endif | ||
1119 | }; | 1116 | }; |
1120 | 1117 | ||
1121 | DECLARE_PER_CPU(struct softnet_data,softnet_data); | 1118 | DECLARE_PER_CPU(struct softnet_data,softnet_data); |
diff --git a/include/net/netdma.h b/include/net/netdma.h index cbe2737f4a61..8ba8ce284eeb 100644 --- a/include/net/netdma.h +++ b/include/net/netdma.h | |||
@@ -24,17 +24,6 @@ | |||
24 | #include <linux/dmaengine.h> | 24 | #include <linux/dmaengine.h> |
25 | #include <linux/skbuff.h> | 25 | #include <linux/skbuff.h> |
26 | 26 | ||
27 | static inline struct dma_chan *get_softnet_dma(void) | ||
28 | { | ||
29 | struct dma_chan *chan; | ||
30 | |||
31 | rcu_read_lock(); | ||
32 | chan = rcu_dereference(__get_cpu_var(softnet_data).net_dma); | ||
33 | rcu_read_unlock(); | ||
34 | |||
35 | return chan; | ||
36 | } | ||
37 | |||
38 | int dma_skb_copy_datagram_iovec(struct dma_chan* chan, | 27 | int dma_skb_copy_datagram_iovec(struct dma_chan* chan, |
39 | struct sk_buff *skb, int offset, struct iovec *to, | 28 | struct sk_buff *skb, int offset, struct iovec *to, |
40 | size_t len, struct dma_pinned_list *pinned_list); | 29 | size_t len, struct dma_pinned_list *pinned_list); |