Merge branches 'bugzilla-11884' and 'bugzilla-8544' into release

[linux-2.6] / include / net / netdma.h

diff --git a/include/net/netdma.h b/include/net/netdma.h
index 19760eb..8ba8ce2 100644 (file)
--- a/include/net/netdma.h
+++ b/include/net/netdma.h
@@ -20,24 +20,12 @@
  */
 #ifndef NETDMA_H
 #define NETDMA_H
-#include <linux/config.h>
 #ifdef CONFIG_NET_DMA
 #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,
-               const struct sk_buff *skb, int offset, struct iovec *to,
+               struct sk_buff *skb, int offset, struct iovec *to,
                size_t len, struct dma_pinned_list *pinned_list);
 
 #endif /* CONFIG_NET_DMA */